From e65a3204ab836f09140f25b0a11306c0c9facc40 Mon Sep 17 00:00:00 2001 From: Michael Campagnaro Date: Tue, 30 Nov 2021 23:03:55 -0500 Subject: [PATCH] Autostash in all git rebase aliases --- aliases | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aliases b/aliases index 090715e..39c9b0e 100644 --- a/aliases +++ b/aliases @@ -918,16 +918,16 @@ alias gpt='git push --tags' alias gpu='git push --set-upstream origin HEAD' alias gr='git reset' alias gr1='git reset HEAD^1' -alias grb='git rebase' +alias grb='git rebase --autostash' alias grba='git rebase --abort' alias grbc='git rebase --continue' alias grbs='git rebase --skip' alias grbi='git rebase -i --autostash' alias grbm='git rebase master --autostash' alias grbmi='git rebase master -i --autostash' -alias grbo='git fetch origin master && git rebase origin/master' -alias grboi='git fetch origin master && git rebase origin/master -i' -alias grbum='git fetch upstream master && git rebase upstream/master' +alias grbo='git fetch origin master && git rebase origin/master --autostash' +alias grboi='git fetch origin master && git rebase origin/master -i --autostash' +alias grbum='git fetch upstream master && git rebase upstream/master --autostash' alias gre='git remote' alias grea='git remote add' alias gremo='git remote remove origin; git remote add origin'