Re: Pick the right default and stop warn on `git pull`

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 25, 2020, 00:39 UTC
Message-ID: <xmqq7dqagtgx.fsf@gitster.c.googlers.com>
In-Reply-To: <CAMMLpeQvofhPjcJ19JrqJs1W3YoQSP+hOainuZJa=QeJzYc+5w@mail.gmail.com>

Alex Henrie <alexhenrie24@gmail.com> writes:

Show 5 quoted lines

> We'd only need a warning if both pull.ff and pull.rebase are unset,
> since that's the only situation where the behavior would change. And
> providentially, we already have a warning in that exact case, although
> we should probably tweak it to explain what the new behavior is going
> to be :-)

If we were starting "git pull" from scratch without any existing configuration and command line options, pull.mode might present a simpler end user experience, but I have to say that pull.ff and pull.rebase that are fairly well ingrained in docs and users' minds, the above plan sounds like a better option to reduce the cognitive overhead for users.

Show 7 quoted lines

>> And yes, it should be possible to do what you suggest, but have you
>> tried? I suspect both the code and the documentation would be quite
>> convoluted.
>
> Yes, I have written a very simple patch that implements the behavior
> that I am suggesting. I will send it to the mailing list later
> tonight.

Let's see how well the comparison between two approaches play out. Thanks.