git.plugin.zsh in zsh_dots-0.6.2

- old
+ new
@@ -1,76 +1,79 @@
 # Aliases
 alias g='git'
 compdef g=git
-alias gst='git status'
-compdef _git gst=git-status
+
+# Branching
 alias gu='git pull'
 compdef _git gl=git-pull
 alias gur='git pull --rebase'
 compdef _git gl=git-pull
-alias gup='git fetch && git rebase'
-compdef _git gup=git-fetch
 alias gp='git push'
 compdef _git gp=git-push
 alias gpf='git push tubbo'
 compdef _git gpf=git-push
 gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
-alias gc='git commit -v'
-compdef _git gc=git-commit
-alias gca='git commit -v -a'
-compdef _git gca=git-commit
 alias gco='git checkout'
 compdef _git gco=git-checkout
-alias gcm='git checkout master'
 alias gb='git branch'
 compdef _git gb=git-branch
 alias gba='git branch -a'
 compdef _git gba=git-branch
-alias gcount='git shortlog -sn'
-compdef gcount=git
-alias gcp='git cherry-pick'
-compdef _git gcp=git-cherry-pick
-alias gl='git l'
+alias gm='git merge'
+compdef _git gm=git-merge
+
+# Logging and Viewing
+alias gl='git blog'
 compdef _git glg=git-log
 alias gls='git log --stat --max-count=5'
 compdef _git gls=git-log
 alias glg='git log --graph --max-count=5'
 compdef _git glg=git-log
 alias lol='git lol'
 compdef _git lol=git-log
+alias gcount='git shortlog -sn'
+compdef gcount=git
+alias gst='git status'
+compdef _git gst=git-status
 alias gsts='git status -s'
 compdef _git gss=git-status
-alias ga='git add'
-compdef _git ga=git-add
-alias gm='git merge'
-compdef _git gm=git-merge
-alias gls="git l"
-compdef _git gls=git-log
-alias grv='git remote -v'
-compdef _get grv=git-remote
 alias gd='git diff'
 compdef _get grv=git-diff
 alias gg='git grep'
 compdef _get gg=git-grep
 alias gbl='git blame'
 compdef _get gbl=git-blame
+
+# Manipulation
+alias gcp='git cherry-pick'
+compdef _git gcp=git-cherry-pick
+alias ga='git add'
+compdef _git ga=git-add
+alias gls="git l"
+compdef _git gls=git-log
+alias grv='git remote -v'
+compdef _get grv=git-remote
 alias gt='git reset'
 compdef _get gt=git-reset
 alias gth='git reset --hard'
 compdef _get gt=git-reset
 alias gts='git reset --soft'
 compdef _get gt=git-reset
 alias gthh='git reset --hard HEAD'
 compdef _get gt=git-reset
+alias gc='git commit -v'
+compdef _git gc=git-commit
+alias gca='git commit -v -a'
+compdef _git gca=git-commit
 
 # Stash
 alias gs='git stash save'
 compdef _get gsh=git-stash
 alias gsp='git stash pop'
 compdef _get gsh=git-stash
 
-# Merging and Rebasing
+# Rebase
 alias gr='git rebase'
 compdef _get gg=git-rebase
 alias grc='git rebase --continue'
 compdef _get gg=git-rebase
 alias grs='git rebase --skip'