adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing issue with last commit merge. missed a conflict

Browse Source
This commit is contained in:
Robby Russell 2011-07-23 09:14:44 -07:00
parent 5e4d89385f
commit 9e783c0a8e
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/git/git.plugin.zsh
View File

@ -49,10 +49,6 @@ function current_branch() {
alias ggpull='git pull origin $(current_branch)' alias ggpull='git pull origin $(current_branch)'
compdef ggpull=git compdef ggpull=git
alias ggpush='git push origin $(current_branch)' alias ggpush='git push origin $(current_branch)'
<<<<<<< HEAD
compdef ggpush=git compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
compdef ggpnp=git compdef ggpnp=git
=======
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
>>>>>>> e5e032f... adding git svn aliases