diff options
| author | Robby Russell <robby@planetargon.com> | 2011-07-23 09:14:44 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2011-07-23 09:14:44 -0700 |
| commit | 9e783c0a8e276e89d9d81951a4c32ea61dadccf1 (patch) | |
| tree | fc7cbe67b3aeb8e996ca1f4cc095dcb70c8098f1 | |
| parent | 5e4d89385f8596b09a3bbb727015f81a53e9d6b4 (diff) | |
| download | zsh-9e783c0a8e276e89d9d81951a4c32ea61dadccf1.tar.gz zsh-9e783c0a8e276e89d9d81951a4c32ea61dadccf1.tar.bz2 zsh-9e783c0a8e276e89d9d81951a4c32ea61dadccf1.zip | |
fixing issue with last commit merge. missed a conflict
| -rw-r--r-- | plugins/git/git.plugin.zsh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 3721d3343..5132b639a 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -49,10 +49,6 @@ 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 |