I think a lot of the functionality of 'git rebase' should move to 'git
cherry-pick', and then all the 'git rebase' code can be simplified
greatly, and tests like these would help a lot.
What do we do about the leakages? Want to take on the task of fixing
the merge-recursive machinery?
Cf. $gmane/222887