summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2012-12-01 11:33:40 -0800
committerRobby Russell <robby@planetargon.com>2012-12-01 11:33:40 -0800
commitf2050fc093975b448339ad3cc8ea1c0dd30f8bd3 (patch)
tree225e1e89a1a039fa79461e9f1c70c10dfb2d250b /plugins
parent29b66b85c83c01d4dd90d9b9a9a0af41fa556d25 (diff)
parent003b0da9e5b2b9f230296aeaedfc946579222d81 (diff)
downloadzsh-f2050fc093975b448339ad3cc8ea1c0dd30f8bd3.tar.gz
zsh-f2050fc093975b448339ad3cc8ea1c0dd30f8bd3.tar.bz2
zsh-f2050fc093975b448339ad3cc8ea1c0dd30f8bd3.zip
Merge pull request #1413 from arnihermann/master
Implement 'gup' as git pull --rebase
Diffstat (limited to 'plugins')
-rw-r--r--plugins/git/git.plugin.zsh2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8d541a275..14ae78d41 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -5,7 +5,7 @@ alias gst='git status'
compdef _git gst=git-status
alias gl='git pull'
compdef _git gl=git-pull
-alias gup='git fetch && git rebase'
+alias gup='git pull --rebase'
compdef _git gup=git-fetch
alias gp='git push'
compdef _git gp=git-push