diff options
| author | Sven Lito <me@svenlito.com> | 2010-10-09 23:09:42 +0100 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2011-07-23 09:13:49 -0700 |
| commit | 96b0af68242ec6235e4162f5e7e1f4d470cb2b22 (patch) | |
| tree | f59b70890548e0866370cadf1fbc36b34739028d | |
| parent | 6bb0c1c9269025867e886b76bcbf737e5a54400d (diff) | |
| download | zsh-96b0af68242ec6235e4162f5e7e1f4d470cb2b22.tar.gz zsh-96b0af68242ec6235e4162f5e7e1f4d470cb2b22.tar.bz2 zsh-96b0af68242ec6235e4162f5e7e1f4d470cb2b22.zip | |
adding git svn aliases
| -rw-r--r-- | plugins/git/git.plugin.zsh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 0c94cc99e..3721d3343 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 |