From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 22 Jul 2021 22:09:39 GMT
Subject: Re: pull.rebase config vs. --ff-only on command line
Message-ID: <60f9eca348290_678a208fb@natae.notmuch>
In-Reply-To: <xmqq7dhi9nxv.fsf@gitster.g>

Junio C Hamano wrote:
> Matthias Baumgarten <matthias.baumgarten@aixigo.com> writes:

> >  * git -c pull.ff=only pull --merge, force a merge commit
> 
> This would fast-forward if it can or otherwise create a merge.
> Unlike "pull --no-ff", this should not "force" a merge commit.

Today people rely on this doing a fast-forward-only merge (with
--no-rebase).

Changing this would break existing behavior they rely on.

It's not hypothetical [1].

[1] https://www.reddit.com/r/git/comments/omcngl/do_you_use_both_pullff_and_pullrebase/

-- 
Felipe Contreras