Merge remote-tracking branch 'cadusk/master'

Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2013-11-18 14:57:43 +01:00
commit 412a38a989
4 changed files with 7 additions and 2 deletions

View file

@ -40,3 +40,7 @@ alias l=la
alias sl=ls # often screw this up
alias afind='ack-grep -il'
# Git aliases
alias gits='git st'
alias gitk='gitk --all &'