"George Spelvin" <linux@xxxxxxxxxxx> 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"? 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html