diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 71388c53a..49d60d441 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -65,9 +65,9 @@ function current_repository() { } # these aliases take advantage of the previous function -alias ggpull='git pull origin $(current_branch)' +alias ggpull='git pull origin --rebase $(current_branch)' compdef ggpull=git alias ggpush='git push origin $(current_branch)' compdef ggpush=git -alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' +alias ggpnp='git pull origin --rebase $(current_branch) && git push origin $(current_branch)' compdef ggpnp=git