Re: [PATCH v7 1/1] pull: add ff-only option

From: Jeff King <peff@peff.net>
Date: Nov 24, 2020, 01:45 UTC
Message-ID: <X7xlz8NAnsh4SE9l@coredump.intra.peff.net>
In-Reply-To: <CAMP44s3Y3BEbPM_69uxmQWiBq2CqwBo4w13M43WvU4nUQZha8g@mail.gmail.com>

On Mon, Nov 23, 2020 at 05:51:42PM -0600, Felipe Contreras wrote:

Show 14 quoted lines

> > On the other hand, it looks quite funny for that single variable
> > that controls the way how pull works, whether rebase or merge is
> > used, is pull.REBASE.
> 
> Which is precisely why I wanted to rename it to pull.mode.
> 
> In my option git pull should have three main modes:
> 
> 1. fast-forward only
> 2. merge
> 3. rebase
> 
> The fast-forward only mode can be considered a merge, or a rebase,
> doesn't matter.

I agree that is much nicer. I'd worry a bit though that it may be confusing to users to have this new mode option _and_ the existing pull.rebase and pull.ff options, which overlap (but not completely). It might be something we could solve with good documentation, though.

-Peff