Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	themes/ys.zsh-theme
This commit is contained in:
Gaetan Semet 2015-04-22 18:22:55 +02:00
commit fdbecb80e3
91 changed files with 2617 additions and 598 deletions

View file

@ -28,12 +28,6 @@ alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
alias t='tail -f'
# because typing 'cd' is A LOT of work!!
alias ..='cd ../'
alias ...='cd ../../'
alias ....='cd ../../../'
alias .....='cd ../../../../'
# Command line head / tail shortcuts
alias -g H='| head'
alias -g T='| tail'