Permalink
Browse files

adding git svn aliases

  • Loading branch information...
1 parent 6bb0c1c commit 96b0af68242ec6235e4162f5e7e1f4d470cb2b22 @svnlto svnlto committed with robbyrussell Oct 9, 2010
Showing with 6 additions and 0 deletions.
  1. +6 −0 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

0 comments on commit 96b0af6

Please sign in to comment.