From: George Spelvin Date: Fri, 14 Jun 2013 21:36:56 GMT Subject: Re: Is there a way to cherry-pick a merge? Message-ID: <20130614213656.6813.qmail@science.horizon.com> In-Reply-To: <7v7ghwo4u4.fsf@alter.siamese.dyndns.org> "George Spelvin" 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.