summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorJakub Nawalaniec <pielgrzym@prymityw.pl>2011-04-03 15:43:39 +0200
committerRobby Russell <robby@planetargon.com>2011-04-03 11:01:48 -0700
commit2e9492969b0ea90932ad3f4298330b75ef8cf2ce (patch)
tree5f71fe30cd52e6dcecb1b87748176080a46caabf /plugins
parent57f55e69ed967e93c0fd44a6a7e470781eb38029 (diff)
downloadzsh-2e9492969b0ea90932ad3f4298330b75ef8cf2ce.tar.gz
zsh-2e9492969b0ea90932ad3f4298330b75ef8cf2ce.tar.bz2
zsh-2e9492969b0ea90932ad3f4298330b75ef8cf2ce.zip
Completions are git subdommand-aware now
Diffstat (limited to 'plugins')
-rw-r--r--plugins/git/git.plugin.zsh18
1 files changed, 10 insertions, 8 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index fc4e56fac..8470c28a4 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -2,15 +2,16 @@
alias g='git'
compdef g=git
alias gst='git status'
-compdef gst=git
+compdef _git gst=git-status
alias gl='git pull'
-compdef gl=git
+compdef _git gl=git-pull
alias gup='git fetch && git rebase'
compdef gup=git
alias gp='git push'
-compdef gp=git
+compdef _git gp=git-push
alias gd='git diff | mate'
-compdef gd=git
+# WTF is mate??
+compdef _git gd=git-diff
alias gdv='git diff -w "$@" | vim -R -'
compdef gdv=git
alias gc='git commit -v'
@@ -18,20 +19,21 @@ compdef gc=git
alias gca='git commit -v -a'
compdef gca=git
alias gco='git checkout'
-compdef gco=git
+compdef _git gco=git-checkout
alias gb='git branch'
-compdef gb=git
+compdef _git gb=git-branch
alias gba='git branch -a'
compdef gba=git
alias gcount='git shortlog -sn'
compdef gcount=git
alias gcp='git cherry-pick'
-compdef gcp=git
+compdef _git gcp=git-cherry-pick
alias glg='git log --stat --max-count=5'
-compdef glg=git
+compdef _git glg=git-log
# Git and svn mix
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
+compdef git-svn-dcommit-push=git
#
# Will return the current branch name