From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Jun 2013 19:44:03 GMT
Subject: Re: Is there a way to cherry-pick a merge?
Message-ID: <7v7ghwo4u4.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130614193729.17663.qmail@science.horizon.com>

"George Spelvin" <linux@horizon.com> 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"?