Merge pull request #1413 from arnihermann/master

Implement 'gup' as git pull --rebase

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