From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 10 Dec 2020 00:31:17 GMT
Subject: Re: fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)
Message-ID: <CAMP44s0663k2M20UACkiBfFERXgj5-_50777zbfa_s1PNYRgww@mail.gmail.com>
In-Reply-To: <xmqqk0tq1xf3.fsf@gitster.c.googlers.com>

On Wed, Dec 9, 2020 at 3:28 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> A spot check: do you have pull.rebase set to anything in your
> config?

I haven't. I typically make the choice to leave Git defaults, to
experience git as most of our users would.

Plus I don't use "git pull".

> So, if this "default change" is done in such a way so that it won't
> make any difference to those who have pull.rebase set to either yes
> or no, I suspect that the fallout would not be as bad as what these
> test failures imply.
>
> On the other hand, if the implementation in the topic forces
> everybody (including those who have made the choice by setting
> pull.rebase) to set another variable before allowing to work with a
> non-ff pull, it would break everybody and is a disaster.

It doesn't. If you have configured pull.rebase you get no warning and no error.

pull.rebase=true translates into pull.mode=rebase.

Cheers.

-- 
Felipe Contreras