summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPoyoman <big-bug@laposte.net>2018-09-12 15:52:42 +0200
committerMarc Cornellà <marc.cornella@live.com>2018-09-12 15:52:42 +0200
commit3d2542f41b8de36877b419f6e74e954d4db06a97 (patch)
tree8227d708e3728d277f0c6ba0638a6294f7ea7dac
parent1487a2ad844bbdff24e1db1cfb086138f477c7e9 (diff)
downloadzsh-3d2542f41b8de36877b419f6e74e954d4db06a97.tar.gz
zsh-3d2542f41b8de36877b419f6e74e954d4db06a97.tar.bz2
zsh-3d2542f41b8de36877b419f6e74e954d4db06a97.zip
git: add pull rebase --autostash aliases (#6791)
-rw-r--r--plugins/git/git.plugin.zsh2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 916866ff5..e6e7125f7 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -248,6 +248,8 @@ alias gunignore='git update-index --no-assume-unchanged'
alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
alias gup='git pull --rebase'
alias gupv='git pull --rebase -v'
+alias gupa='git pull --rebase --autostash'
+alias gupav='git pull --rebase --autostash -v'
alias glum='git pull upstream master'
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'