From cd59e6c2b7aa2696a361c4b76adf902293279ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Cauwelier?= Date: Tue, 8 Jan 2013 11:04:11 +0100 Subject: [PATCH] plugins/git: missing compdefs and new aliases --- plugins/git/git.plugin.zsh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 6c016aa6b..fc071f95a 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -12,19 +12,25 @@ compdef _git gup=git-fetch alias gp='git push' compdef _git gp=git-push alias gd='git diff' +compdef _git gd=git-diff gdv() { git diff -w "$@" | view - } compdef _git gdv=git-diff +alias gdc='git diff --cached' +compdef _git gdc=git-diff alias gc='git commit -v' compdef _git gc=git-commit alias gc!='git commit -v --amend' compdef _git gc!=git-commit alias gca='git commit -v -a' -compdef _git gc=git-commit +compdef _git gca=git-commit alias gca!='git commit -v -a --amend' compdef _git gca!=git-commit alias gco='git checkout' compdef _git gco=git-checkout alias gcm='git checkout master' +compdef _git gcm=git-checkout +alias grm='git rebase master' +compdef _git grm=git-rebase alias gr='git remote' compdef _git gr=git-remote alias grv='git remote -v' @@ -44,6 +50,7 @@ compdef _git gba=git-branch alias gcount='git shortlog -sn' compdef gcount=git alias gcl='git config --list' +compdef _git gcl=git-config alias gcp='git cherry-pick' compdef _git gcp=git-cherry-pick alias glg='git log --stat --max-count=5' @@ -61,10 +68,15 @@ compdef _git ga=git-add alias gm='git merge' compdef _git gm=git-merge alias grh='git reset HEAD' +compdef _git grh=git-reset alias grhh='git reset HEAD --hard' +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 gf=git-ls-files alias gpoat='git push origin --all && git push origin --tags' +compdef _git gpoat=git-push # Will cd into the top of the current repository # or submodule.