Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/git/git.plugin.zsh
	plugins/repo/repo.plugin.zsh
This commit is contained in:
Gaetan Semet 2013-06-26 17:24:11 +02:00
commit e646ee6caa
16 changed files with 296 additions and 27 deletions

View file

@ -33,7 +33,7 @@ fi
# List direcory contents
alias lsa='ls -lah'
#alias l='ls -la'
alias l='ls -la'
alias ll='ls -l'
alias la='ls -lA'
alias l=la