Hi Phillip, Yes, I know. It's just that I was under the impression ORIG_HEAD was to be reverted to .git/rebase-merge/orig-head at the finish of the rebase. Personally, it's the behavior I would expect. Thanks for the tips. Regards, Erik On Thu, Dec 16, 2021 at 5:27 PM Phillip Wood <phillip.wood@xxxxxxxxxxxx> wrote: > > Hi Erik > > On 16/12/2021 14:30, Erik Cervin Edin wrote: > > Steps to reproduce: > > 1. git-rebase -i > > 2. edit XYZ > > 3. git-reset HEAD~ > > "git reset" will update ORIG_HEAD to the current HEAD before resetting > so here ORIG_HEAD gets updated to point to XYZ > > > 4. git-commit -C ORIG_HEAD -a > > 5. git-rebase --continue > > 6. git-show ORIG_HEAD > > > > Expected behavior: > > ORIG_HEAD should point at the previous HEAD of the rebased branch > > > > Actual behavior: > > ORIG_HEAD points to XYZ > > > > My understanding from reading https://stackoverflow.com/a/64949884 is > > that this is incorrect behavior. > > > > Perhaps this is as intended but I would at least personally prefer > > that ORIG_HEAD would point to the previous HEAD of the rebased branch. > > You can use the reflog to get the previous HEAD of the rebased branch > after rebasing. Immediately after the rebase branch-name@{1} will point > to the pre-rebase HEAD. > > Best Wishes > > Phillip > > > > Seen in: > > git version 2.31.1.windows.1 > > > > Possibly related to > > e100bea481 - rebase -i: stop overwriting ORIG_HEAD buffer > -- Erik Cervin-Edin Erik.CervinEd.in
