From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon, 12 Jul 2021 21:06:34 GMT
Subject: Re: [PATCH] pull: abort if --ff-only is given and fast-forwarding is impossible
Message-ID: <60ecaedae42a8_a68ed20825@natae.notmuch>
In-Reply-To: <CABPp-BGGi_b3PeFZ4-uErLS2vad-mX5gcuO+=nfgQreRMSCYZw@mail.gmail.com>

Elijah Newren wrote:

> I think we should concentrate on making sure that we provide
> reasonable behavior when conflicting options/command-lines from the
> already provided set are specified.

The only way to do that in a way that a) does not significantly alter
existing semantics, b) can be clearly documented, and c) can be
implemented without a plethora of exceptions, is to create a new
configuration orthogonal to all the existing ones:

  pull.mode=fast-forward

-- 
Felipe Contreras