From 96b0af68242ec6235e4162f5e7e1f4d470cb2b22 Mon Sep 17 00:00:00 2001
From: Sven Lito <me@svenlito.com>
Date: Sat, 9 Oct 2010 23:09:42 +0100
Subject: [PATCH] adding git svn aliases

---
 plugins/git/git.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 0c94cc99..3721d334 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -34,6 +34,8 @@ compdef _git glgg=git-log
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 compdef git-svn-dcommit-push=git
 
+alias gsr='git svn rebase'
+alias gsd='git svn dcommit'
 #
 # Will return the current branch name
 # Usage example: git pull origin $(current_branch)
@@ -47,6 +49,10 @@ function current_branch() {
 alias ggpull='git pull origin $(current_branch)'
 compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
+<<<<<<< HEAD
 compdef ggpush=git
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
 compdef ggpnp=git
+=======
+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
+>>>>>>> e5e032f... adding git svn aliases