Junio C Hamano [off-list ref] wrote:
In order to rewrite this mess to be more manageable, I would
first do "diff master topic", to extract the changes into a
single patch, start picking pieces from it to get logically
self-contained units, and start building on top of "master":
[etc.]
Oh, good. It's not just me, then! ;-)
This is more or less exactly how I built the various patches I submitted
here. The main difference is that I used StGIT because I'm less
competent than Junio and didn't always manage to get all my changes in
the right places to begin with.
(I really look forward to a StGIT which can withstand git-prune.)
-- [mdw]