7655a655f641c211db39680a73f15b1b70e43aa0

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #1881 from iammichiel/patch-1

Adding a rebase option to git alias.

Diff

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index 6c016aa6be1146cd61e23315e5343783cd44899c..6f2f59df30b6de419c16b502f4c3854fb6bc874e 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -95,6 +95,8 @@ function current_repository() {
 6 # these aliases take advantage of the previous function
 7 alias ggpull='git pull origin $(current_branch)'
 8 compdef ggpull=git
 9+alias ggpur='git pull --rebase origin $(current_branch)'
10+compdef ggpur=git
11 alias ggpush='git push origin $(current_branch)'
12 compdef ggpush=git
13 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'