Re: cherry-pick '-m' curiosity

From: Sergey Organov <sorganov@gmail.com>
Date: Feb 6, 2018, 09:25 UTC
Message-ID: <87eflyv5a1.fsf@javad.com>
In-Reply-To: <CAGZ79kZ5ZiETM7L6DRr1pSXMGBPPyOazsM8Gi0E9jrMYfwrfdA@mail.gmail.com>

Stefan Beller <sbeller@google.com> writes:

Show 17 quoted lines

> On Mon, Feb 5, 2018 at 3:46 AM, Sergey Organov <sorganov@gmail.com> wrote:
>> Hello,
>>
>> $ git help cherry-pick
>>
>> -m parent-number, --mainline parent-number
>>            Usually you cannot cherry-pick a merge because you do not
>>            know which side of the merge should be considered the
>>            mainline.
>>
>> Isn't it always the case that "mainline" is the first parent, as that's
>> how "git merge" happens to work?
>>
>> Is, say, "-m 2" ever useful?
>
> Say you want to backport everything except that topic using cherry-picks.
> Then -m2 would be useful?

Didn't get the idea, sorry. Care to clarify?

-- Sergey