From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Wed, 21 Jul 2021 00:09:13 GMT
Subject: Re: [PATCH 6/9] pull: make --rebase and --no-rebase override pull.ff=only
Message-ID: <60f765a9c777e_14ef2420835@natae.notmuch>
In-Reply-To: <xmqqpmvcfsol.fsf@gitster.g>

Junio C Hamano wrote:
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 
> > From: Elijah Newren <newren@gmail.com>
> >
> > Fix the last few precedence tests failing in t7601 by now implementing
> > the logic to have --[no-]rebase override a pull.ff=only config setting.
> 
> Because we only have opt_rebase and opt_ff, unless we are in a very
> early part of the code, we cannot tell if "opt_rebase >= 0" we see
> came from the command line or from the configuration, and because
> pull.rebase, pull.ff, --rebase=<kind>, and <--ff|--ff-only|--no-ff>
> have intricate interactions among them, we'd probably need to behave
> differently depending on where "opt_rebase >= 0" came from.

Where is that backwards-incompatible change explained in the
documentation?

-- 
Felipe Contreras