From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "C.J. Jameson" <cjcjameson@gmail.com>, git@vger.kernel.org
Subject: Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1
Date: Wed, 20 Mar 2019 15:01:44 +0300 [thread overview]
Message-ID: <871s31vjo7.fsf@javad.com> (raw)
In-Reply-To: <xmqq1s32w3vu.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Wed, 20 Mar 2019 13:45:09 +0900")
Junio C Hamano <gitster@pobox.com> writes:
[...]
> But I do have a very strong opinion against adding yet another
> option that takes an optional argument. If we want to allow
> cherry-picking a merge commit just as easy as cherrry-picking a
> single-parent commit, "git cherry-pick -m merge" (assuming 'merge'
> is the tip of a branch that is a merge commit) that still requires
> the user to say "-m" is not a good improvement. We should just
> accept "git cherry-pick merge" without any "-m" if we want to move
> in this direction, I would think.
Let's just make '-m 1' the default option indeed. No need for further
complexities.
Exactly according to what Junio has already said before. Here:
https://public-inbox.org/git/xmqqsh5gt9sm.fsf@gitster-ct.c.googlers.com
Junio wrote:
> Now, it appears, at least to me, that the world pretty much accepted
> that the first-parent worldview is often very convenient and worth
> supporting by the tool, so the next logical step might be to set
> opts->mainline to 1 by default (and allow an explicit "-m $n" from
> the command line to override it). But that should happen after this
> patch lands---it is logically a separate step, I would think.
... and as that patch already landed...
-- Sergey
next prev parent reply other threads:[~2019-03-20 12:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 3:54 [RFC PATCH] cherry-pick: set default `--mainline` parent to 1 C.J. Jameson
2019-03-20 4:45 ` Junio C Hamano
2019-03-20 12:01 ` Sergey Organov [this message]
2019-03-20 14:39 ` Elijah Newren
2019-03-20 15:59 ` Sergey Organov
2019-03-21 1:51 ` C.J. Jameson
2019-03-21 2:17 ` Junio C Hamano
2019-03-21 3:15 ` Junio C Hamano
2019-03-21 5:40 ` Sergey Organov
2019-03-21 5:47 ` Junio C Hamano
2019-03-21 6:12 ` Sergey Organov
2019-03-21 8:31 ` Junio C Hamano
2019-03-21 8:31 ` Junio C Hamano
2019-03-21 11:59 ` Sergey Organov
2019-03-22 2:24 ` Junio C Hamano
2019-03-22 15:22 ` Sergey Organov
2019-03-22 18:27 ` C.J. Jameson
2019-03-25 14:55 ` Johannes Schindelin
2019-03-25 15:41 ` C.J. Jameson
2019-03-21 6:54 ` Sergey Organov
2019-03-22 10:23 ` Johannes Schindelin
2019-03-22 10:13 ` Johannes Schindelin
2019-03-20 9:44 ` Duy Nguyen
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=871s31vjo7.fsf@javad.com \
--to=sorganov@gmail.com \
--cc=cjcjameson@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).