Merge remote-tracking branch 'bors-ltd/master'

Conflicts:
	plugins/git/git.plugin.zsh
This commit is contained in:
Gaetan Semet 2013-07-30 16:16:38 +02:00
commit 5178757f8f

View file

@ -91,7 +91,7 @@ compdef _git grhh=git-reset
alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
compdef _git gwc=git-whatchanged
alias gf='git ls-files | grep'
compdef _git gwc=git-whatchanged
compdef _git gf=git-ls-files
alias gls='git ls-files | grep'
compdef _git gls=git-ls-files
alias gpoat='git push origin --all && git push origin --tags'