From 2cefde5fcfeebc6fff2bdd2845236cec94c95a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natal=20Ng=C3=A9tal?= Date: Tue, 25 Jan 2011 14:08:20 +0100 Subject: [PATCH] [Plugin] Git: Alias for git-svn, rebase and dcommit, and if the repos is not clean, use git stash. --- plugins/git/git.plugin.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index ec3badc2e..c5864271d 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -18,6 +18,8 @@ alias gcpe='git cherry-pick --edit ' # Git and svn mix alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' +alias gsup= !DIRTY=$(git status --porcelain -uno) && git stash save svn-up-auto && git svn rebase && test -n \"$DIRTY\" && git stash pop +alias gsc=!DIRTY=$(git status --porcelain -uno) && git stash save svn-up-auto && git svn dcommit && test -n \"$DIRTY\" && git stash pop # # Will return the current branch name