d11fb9d47c85b623831919f1910dd862e600c63d

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index b21c6a8e070979bd9f496760419a5f3e83795c8a..85eabced02fa227a3d0eab7ddbfd5f4e9ce36ca3 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -6,24 +6,21 @@ compdef _git gst=git-status
 6 alias gl='git pull'
 7 compdef _git gl=git-pull
 8 alias gup='git fetch && git rebase'
 9-compdef gup=git
10+compdef _git gup=git-fetch
11 alias gp='git push'
12 compdef _git gp=git-push
13-alias gd='git diff | mate'
14-# WTF is mate??
15-compdef _git gd=git-diff
16 gdv() { git diff -w "$@" | view - }
17-compdef gdv=git
18+compdef _git gdv=git-diff
19 alias gc='git commit -v'
20-compdef gc=git
21+compdef _git gc=git-commit
22 alias gca='git commit -v -a'
23-compdef gca=git
24+compdef _git gca=git-commit
25 alias gco='git checkout'
26 compdef _git gco=git-checkout
27 alias gb='git branch'
28 compdef _git gb=git-branch
29 alias gba='git branch -a'
30-compdef gba=git
31+compdef _git gba=git-branch
32 alias gcount='git shortlog -sn'
33 compdef gcount=git
34 alias gcp='git cherry-pick'