Merge remote-tracking branch 'plalloni/master'

Conflicts:
	plugins/git/git.plugin.zsh
This commit is contained in:
Pablo Lalloni 2013-03-25 11:09:13 -03:00
commit 9f3a26149b

View file

@ -11,6 +11,8 @@ alias gp='git push'
compdef _git gp=git-push
alias gd='git diff'
compdef _git gd=git-diff
alias gds='git diff --staged'
compdef _git gds=git-diff
gdv() { git diff -w "$@" | view - }
compdef _git gdv=git-diff
alias gds='git diff --staged'