Re: [PATCH 0/2] git rebase: Make sure upstream branch is left alone.

Ben writes: > Hi Phillip, > > The expected behavior: (as per v2.21.0:/git-legacy-rebase.sh:679) > AUTOSTASH=$(git stash create autostash) > git reset --hard > git checkout master > git rebase upstream > git stash apply $AUTOSTASH > > > The actual behavior: > AUTOSTASH=$(g

Re: [PATCH 0/2] git rebase: Make sure upstream branch is left alone.

Hi Phillip, The expected behavior: (as per v2.21.0:/git-legacy-rebase.sh:679) AUTOSTASH=$(git stash create autostash) git reset --hard git checkout master git rebase upstream git stash apply $AUTOSTASH The actual behavior: AUTOSTASH=$(git stash create autostash) git

Re: [PATCH 0/2] git rebase: Make sure upstream branch is left alone.

Hi Ben On 18/08/2019 10:53, Ben Wijen wrote: I found an issue with git rebase --autostash with an dirty worktree/index. It seems the currently active branch is moved, which is not correct. I'm not sure I understand what you mean by "the currently active branch is moved". 'git rebase --auto

[PATCH 0/2] git rebase: Make sure upstream branch is left alone.

I found an issue with git rebase --autostash with an dirty worktree/index. It seems the currently active branch is moved, which is not correct. The following patches contain both a test and a fix. Ben Wijen (2): t3420: never change upstream branch rebase.c: make sure current branch isn't mo