Howard Miller [off-list ref] writes:
I have two branches - I know that one differs from the other entirely
by a (large) number of commits that I have made over some time.
Unfortunately, these are now all mixed up with a load of other commits
that have been merged into both from the upstream project.
"now all mixed up" makes me feel a lot less optimistic, but have you
tried git-cherry?