Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
This commit is contained in:
Andrew Schwartzmeyer 2013-10-31 02:26:51 -07:00
commit 0259e4bb78
13 changed files with 600 additions and 11 deletions

View file

@ -1,3 +1,11 @@
#
# Aliases
#
alias ta='tmux attach -t'
alias ts='tmux new-session -s'
alias tl='tmux list-sessions'
# Only run if tmux is actually installed
if which tmux &> /dev/null
then