git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sergey Organov <sorganov@gmail.com>
To: git@vger.kernel.org
Subject: cherry-pick '-m' curiosity
Date: Mon, 05 Feb 2018 14:46:39 +0300	[thread overview]
Message-ID: <87wozry7z4.fsf@javad.com> (raw)

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?

-- 
Sergey

             reply	other threads:[~2018-02-05 11:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-05 11:46 Sergey Organov [this message]
2018-02-05 19:55 ` cherry-pick '-m' curiosity Junio C Hamano
2018-02-06 13:05   ` Sergey Organov
2018-02-05 22:03 ` Stefan Beller
2018-02-06  9:25   ` Sergey Organov
2018-02-19 21:39 ` G. Sylvie Davies
2018-02-20 16:23   ` Sergey Organov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wozry7z4.fsf@javad.com \
    --to=sorganov@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).