2e9492969b0ea90932ad3f4298330b75ef8cf2ce

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index fc4e56fac1df7cc7db3cef9cbb45471cabe59c5b..8470c28a44e08558531791518739a6bc2a92fa2d 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -2,15 +2,16 @@
 6 alias g='git'
 7 compdef g=git
 8 alias gst='git status'
 9-compdef gst=git
10+compdef _git gst=git-status
11 alias gl='git pull'
12-compdef gl=git
13+compdef _git gl=git-pull
14 alias gup='git fetch && git rebase'
15 compdef gup=git
16 alias gp='git push'
17-compdef gp=git
18+compdef _git gp=git-push
19 alias gd='git diff | mate'
20-compdef gd=git
21+# WTF is mate??
22+compdef _git gd=git-diff
23 alias gdv='git diff -w "$@" | vim -R -'
24 compdef gdv=git
25 alias gc='git commit -v'
26@@ -18,20 +19,21 @@ compdef gc=git
27 alias gca='git commit -v -a'
28 compdef gca=git
29 alias gco='git checkout'
30-compdef gco=git
31+compdef _git gco=git-checkout
32 alias gb='git branch'
33-compdef gb=git
34+compdef _git gb=git-branch
35 alias gba='git branch -a'
36 compdef gba=git
37 alias gcount='git shortlog -sn'
38 compdef gcount=git
39 alias gcp='git cherry-pick'
40-compdef gcp=git
41+compdef _git gcp=git-cherry-pick
42 alias glg='git log --stat --max-count=5'
43-compdef glg=git
44+compdef _git glg=git-log
45 
46 # Git and svn mix
47 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
48+compdef git-svn-dcommit-push=git
49 
50 #
51 # Will return the current branch name