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

[Alex Henrie <alexhenrie24@gmail.com>]

On Mon, Nov 23, 2020 at 8:14 AM Vít Ondruch <vondruch@redhat.com> wrote:
>
> Hi,
>
> 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.
>
> BTW, I was motivated to open this discussion by this [2] Fedora ticket.
>
>
> Vít
>
>
>
> [1] https://github.com/git/git/commit/d18c950a69
>
> [2] https://bugzilla.redhat.com/show_bug.cgi?id=1900441

Hi Vit, as the message explains, you can use `git config --global
pull.rebase false` to permanently silence the warning for all of your
repositories. The idea is that in a future version of Git, users will
not be allowed to pull at all without specifying a reconciliation
strategy. This will prevent users (novices in particular) from
accidentally creating messes by merging branches that should have been
rebased instead.

Personally, I would rather have pull.rebase be true by default (and
I'm sure many others would like that too), but there are so many users
who really do want to merge that it's not reasonable to make rebasing
the default. The most reasonable solution is to ask the user to be
explicit about what they want and not make assumptions.

-Alex