From f7b2228a04b02cbcfdbe772d9959bf9800c2a508 Mon Sep 17 00:00:00 2001 From: Poyoman Date: Thu, 3 May 2018 22:56:18 +0200 Subject: [PATCH] What about using autostash ? This is quite a nice feature from git. I'm not sure if it's better adding it to gup / gupv, or if it should be added to a new alias :) --- plugins/git/git.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index fd55be138..b1ee6b4ea 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -240,8 +240,8 @@ alias gtv='git tag | sort -V' 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 gup='git pull --rebase --autostash' +alias gupv='git pull --rebase --autostash -v' alias glum='git pull upstream master' alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'