Re: pull.rebase config vs. --ff-only on command line

Junio C Hamano wrote:

Matthias Baumgarten [off-list ref] writes:

quoted

 * 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