2 messages, 2 authors, 2016-06-15 · open the first message on its own page
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:45
"George Spelvin" [off-list ref] writes:
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"?
From: George Spelvin <hidden>
Date: 2016-06-15 22:57:45
"George Spelvin" [off-list ref] writes:
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. That's why I've been looking for an alternative.