Re: Is there a way to cherry-pick a merge?

"George Spelvin" [off-list ref] writes:

"George Spelvin" [off-list ref] writes:

quoted

quoted

Sometimes I'd like to repeat a previously performed merge, preserving
the commit message.  And, if possible, the conflict resolutions.

Is it "git merge commit^2"?

I suppose that was an obvious one to leave out of my alternatives list.

This is what I've been doing, but it requires I cut and paste the commit
message.  Preserving timestamps, author, etc. is even more awkward.

In the meantime, "git commit --amend -C commit" would be a
workaround, I would guess.