From: Junio C Hamano <gitster@pobox.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: Elijah Newren <newren@gmail.com>,
"C.J. Jameson" <cjcjameson@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1
Date: Fri, 22 Mar 2019 11:24:01 +0900 [thread overview]
Message-ID: <xmqqy357r6im.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <87k1gsh1zs.fsf@javad.com> (Sergey Organov's message of "Thu, 21 Mar 2019 14:59:35 +0300")
Sergey Organov <sorganov@gmail.com> writes:
>> With it reverted, "[alias] cp = cherry-pick -m1" can be used to train
>> the user to blindly pick a range that has a merge without thinking,
>> which is what I meant by "ship has already sailed".
>
> Did you mean "With it *not* reverted" here?
Thanks for a correction. Yes, if we do not revert it, then that
would allow people to follow a bad workflow we do not want to
recommend (and I think that is what Elijah does not want to do), and
that is why I said the ship has already sailed.
> Those who don't like such alias are still free not to define or use it.
That's not the point. Those who do want to be careful can learn to
use a new option --forbid-stupid-things, but why should they? They
should be forbidden from doing stupid things by default, which is
the point of this exchange.
next prev parent reply other threads:[~2019-03-22 2:24 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
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 [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy357r6im.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=cjcjameson@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=sorganov@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).