git.plugin.zsh in zsh_dots-0.5.3

- old
+ new

@@ -36,17 +36,17 @@
 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 gss='git status -s'
+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 log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+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
@@ -60,22 +60,20 @@
 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 gs='git pull --rebase && git push'
-compdef _get gs=git-pull
-compdef _get gs=git-push
-alias gsf='git pull --rebase && git push tubbo'
-compdef _get gs=git-pull
-compdef _get gs=git-push
-alias gy='git synchronize'
-compdef _get gy=git-synchronize
 alias garc='ga . && grc'
 compdef _get garc=git-add
 compdef _get garc=git-rebase
 
+# Stash
+alias gs='git stash save'
+compdef _get gsh=git-stash
+alias gsp='git stash pop'
+compdef _get gsh=git-stash
+
 # Merging and Rebasing
 alias gr='git rebase'
 compdef _get gg=git-rebase
 alias grc='git rebase --continue'
 compdef _get gg=git-rebase
@@ -95,23 +93,21 @@
 compdef _get grv=git-status
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git
+alias gvr='git svn rebase'
+alias gvd='git svn dcommit'
 
-alias gsr='git svn rebase'
-alias gsd='git svn dcommit'
-#
 # Will return the current branch name
 # Usage example: git pull origin $(current_branch)
-#
 function current_branch() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
   echo ${ref#refs/heads/}
 }
 
-# these aliases take advantage of the previous function
+# 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)'
@@ -119,8 +115,5 @@
 
 # Wrap git in the hub gem if it's installed
 if (( $+commands[hub] )) ; then
   function git() {hub "$@"}
 fi
-
-# SHIP IT
-alias ship='echo ">>> SHIP IT <<<"; git checkout master; git pull --rebase origin master; git merge develop; git push origin master'