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

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Nov 23, 2020, 19:43 UTC
Message-ID: <CAMP44s2rhOXfqmyd-rUUmzjsbqq9juf1HNsd32aO-Qcd-m0QNw@mail.gmail.com>
In-Reply-To: <742df4c2-2bc5-8a4b-8de1-cd5e48718398@redhat.com>

On Mon, Nov 23, 2020 at 9:17 AM Vít Ondruch <vondruch@redhat.com> wrote:

Show 8 quoted lines

> 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. Please select any strategy considered more appropriate
> and stop warning me. I know I could change my configuration, but I'll
> change it just if I want to differ from defaults. I don't need to be
> told that I am using wrong default. I'd like to keep my trust in Git
> upstream, but this is was not trustworthy decision IMO.

Indeed.

This is why I sent patches to change the "git pull" default to merge the remote branch, but only if it's a fast-forward. If it's not, then the user would have to either merge, or rebase.

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

This is the best sensible default.

Cheers.

-- 
Felipe Contreras