Re: cherry-pick '-m' curiosity

From: G. Sylvie Davies <sylvie@bit-booster.com>
Date: Feb 19, 2018, 21:39 UTC
Message-ID: <CAAj3zPxiLxqgnKXth2EZZWwgYhW_cHEcxbM6_BqpzpHR_ipqyQ@mail.gmail.com>
In-Reply-To: <87wozry7z4.fsf@javad.com>

On Mon, Feb 5, 2018 at 3:46 AM, Sergey Organov <sorganov@gmail.com> wrote:

Show 12 quoted lines

> 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?
>

First-parent will be whatever commit you were sitting on when you typed "git merge".

If you're sitting on your branch and you type "git fetch; git merge origin/master", then "mainline" will be 2nd parent.

Same happens if you type "git pull".

Further reading here: https://developer.atlassian.com/blog/2016/04/stop-foxtrots-now/

"git revert -m" also has the same problem.

> Is, say, "-m 2" ever useful?
>
> --
> Sergey