96b0af68242ec6235e4162f5e7e1f4d470cb2b22

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index 0c94cc99e19401ae691fcd3c31b6b2e4fbebf81e..3721d3343d73fd831a8eccc8a14b0283662e5580 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -34,6 +34,8 @@ compdef _git glgg=git-log
 6 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 7 compdef git-svn-dcommit-push=git
 8 
 9+alias gsr='git svn rebase'
10+alias gsd='git svn dcommit'
11 #
12 # Will return the current branch name
13 # Usage example: git pull origin $(current_branch)
14@@ -47,6 +49,10 @@ function current_branch() {
15 alias ggpull='git pull origin $(current_branch)'
16 compdef ggpull=git
17 alias ggpush='git push origin $(current_branch)'
18+<<<<<<< HEAD
19 compdef ggpush=git
20 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
21 compdef ggpnp=git
22+=======
23+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
24+>>>>>>> e5e032f... adding git svn aliases