Re: flatten-merge history

Henning Moll [off-list ref] writes:

1. For P, A is the nearest prior commit on 'master'
2. on master: git rebase -i A^
3. change A from pick to edit. save. quit
4. git merge P
5. git rebase --continue

From the perspective of 'master' this worked. But as all of the commits
have been rewritten, the branches b1 and b2 no longer refer to
'master'. Branch b2, for example, still branches off at B and not B'.

You only rebased master, so b1 and b2 were unchanged.  If you want to
change b1 and b2 you have to rebase them as well.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."