From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Mar 2019 02:24:01 GMT
Subject: Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1
Message-ID: <xmqqy357r6im.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <87k1gsh1zs.fsf@javad.com>

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.