git magic help required

[Reuben Thomas]

Hi,

having done some more work on my patch #7017, I pulled updates from
master to make sure I had no conflicts, which worked fine, but now I
have a commit after those updates, and a commit before, which I want
to merge in some way to get a single patch. I'm afraid this is outside
my knowledge of git: what do I do?

Please feel free to point me at a relevant web page; it's just that,
unlike the simpler case of merging successive commits, I have no idea
what to search for!

-- 
http://rrt.sc3d.org