git rebase: retain original head?

Hello, I frequently run an interactive rebase to change the order of recent commits, apply fixups, etc. When merge conflicts occur I often want to compare the result with the original head prior to starting the rebase. In the past I used "git diff ORIG_HEAD". This used to work as long as I did no

Re: git rebase: retain original head?

On Tue, Jan 8, 2019 at 6:43 PM Andreas Schwab wrote: > > On Jan 08 2019, Markus Wiederkehr wrote: > > > Would it be possible to retain this information? > > You could use the reflog of the current branch, where it is the second > entry. It is not, depending on what

Re: git rebase: retain original head?

On Tue, Jan 8, 2019 at 10:29 PM Andreas Schwab wrote: > > On Jan 08 2019, Markus Wiederkehr wrote: > > > It is not, depending on what happens in the rebase it could be any > > entry. > > Don't look at the HEAD reflog, use the branch reflog, ie. @{1}. That&

Re: git rebase: retain original head?

On Wed, Jan 9, 2019 at 3:05 PM Johannes Schindelin wrote: > > Having said that, it is an unintended regression in the built-in rebase. > Markus, could you come up with a minimal test case, preferably in the form > of a patch to t/t3415-rebase-autosquash.sh? I don't think I'm familiar enough with