Sébastien Cevey [off-list ref] writes:
[1] OT: I didn't find a simple command to do this:
$ git diff ..the-end-state > finish.patch
$ patch -p1 < finish.patch
$ git commit -a -s
(where the original HEAD and the-end-state have an older MRCA with
rewritten history inbetween, and I don't want to apply that
history and solve conflicts, just "get my tree to the end state".)
Any tip?
$ git read-tree -m -u the-end-state
$ git commit -a -s