summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Nawalaniec <pielgrzym@prymityw.pl>2011-04-03 13:50:05 +0200
committerRobby Russell <robby@planetargon.com>2011-04-03 11:01:48 -0700
commit57f55e69ed967e93c0fd44a6a7e470781eb38029 (patch)
treebe22b66f370bddf32dff1e27e1d71f17f1f92c15
parent05fc020a081846245a5a4a26d190652cb8cf9add (diff)
downloadzsh-57f55e69ed967e93c0fd44a6a7e470781eb38029.tar.gz
zsh-57f55e69ed967e93c0fd44a6a7e470781eb38029.tar.bz2
zsh-57f55e69ed967e93c0fd44a6a7e470781eb38029.zip
Zsh will now complete git aliases with git stuff
-rw-r--r--plugins/git/git.plugin.zsh18
1 files changed, 18 insertions, 0 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 71a62819b..fc4e56fac 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,19 +1,34 @@
# Aliases
alias g='git'
+compdef g=git
alias gst='git status'
+compdef gst=git
alias gl='git pull'
+compdef gl=git
alias gup='git fetch && git rebase'
+compdef gup=git
alias gp='git push'
+compdef gp=git
alias gd='git diff | mate'
+compdef gd=git
alias gdv='git diff -w "$@" | vim -R -'
+compdef gdv=git
alias gc='git commit -v'
+compdef gc=git
alias gca='git commit -v -a'
+compdef gca=git
alias gco='git checkout'
+compdef gco=git
alias gb='git branch'
+compdef gb=git
alias gba='git branch -a'
+compdef gba=git
alias gcount='git shortlog -sn'
+compdef gcount=git
alias gcp='git cherry-pick'
+compdef gcp=git
alias glg='git log --stat --max-count=5'
+compdef glg=git
# Git and svn mix
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
@@ -29,5 +44,8 @@ function current_branch() {
# these aliases take advantage of the previous function
alias ggpull='git pull origin $(current_branch)'
+compdef ggpull=git
alias ggpush='git push origin $(current_branch)'
+compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
+compdef ggpnp=git