Skip to content

GitLab

Commit 9e783c0a authored by Robby Russell's avatar Robby Russell
Browse files

fixing issue with last commit merge. missed a conflict

parent 5e4d8938
Hide whitespace changes
Inline Side-by-side
plugins/git/git.plugin.zsh
View file @ 9e783c0a
...@@ -49,10 +49,6 @@ function current_branch() { ...@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment