Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/aliases.zsh
This commit is contained in:
Sébastien M-B 2013-02-08 19:08:06 +01:00
commit 2595484a97
107 changed files with 5812 additions and 351 deletions

View file

@ -8,6 +8,7 @@ alias -- -='cd -'
# Super user
alias _='sudo'
alias please='sudo'
#alias g='grep -in'
@ -18,6 +19,7 @@ alias history='fc -l 1'
alias lsa='ls -lah'
#alias l='ls -la'
alias ll='ls -l'
alias la='ls -lA'
alias sl=ls # often screw this up
alias afind='ack-grep -il'