Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into test-pull

Conflicts:
	themes/agnoster.zsh-theme
	tools/install.sh
This commit is contained in:
Aaron Biggs 2014-06-11 08:59:00 -05:00
commit ca14eb83b4
121 changed files with 4113 additions and 1248 deletions

View file

@ -27,9 +27,9 @@ else
fi
# List direcory contents
alias lsa='ls -lah'
alias l='ls -la'
alias ll='ls -l'
alias la='ls -lA'
alias l='ls -lah'
alias ll='ls -lh'
alias la='ls -lAh'
alias sl=ls # often screw this up
alias afind='ack-grep -il'