From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon, 23 Nov 2020 19:37:33 GMT
Subject: Re: Pick the right default and stop warn on `git pull`
Message-ID: <CAMP44s2H6ubW47RCEs4B4qafpU8Z4Z9Ue3BaAMB-T_pEcxkXig@mail.gmail.com>
In-Reply-To: <xmqqh7pfopki.fsf@gitster.c.googlers.com>

On Mon, Nov 23, 2020 at 1:15 PM Junio C Hamano <gitster@pobox.com> wrote:
> Vít Ondruch <vondruch@redhat.com> writes:

> > While I understand that the merge after `git pull` is probably not the
> > best strategy (as explained in [1]), asking people to change their
> > configuration to choose their default strategy with every `git pull`
> > is not any better.
>
> There is no clear "default that would suit everybody".

This is a false dichotomy.

Yes, there's no default that would suit everybody, but there is a
better default than the current one:

fast-forward-only:

https://lore.kernel.org/git/1398988808-29678-1-git-send-email-felipe.contreras@gmail.com/

-- 
Felipe Contreras