From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 17 Jul 2021 18:28:44 GMT
Subject: RE: [PATCH 6/9] pull: make --rebase and --no-rebase override pull.ff=only
Message-ID: <60f3215c9f3ce_25f22081c@natae.notmuch>
In-Reply-To: <b379fea097d65a28f1791f7f2f9432b6689a977f.1626536508.git.gitgitgadget@gmail.com>

Elijah Newren via GitGitGadget wrote:
> 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.

This is a semantic change that breaks current behavior.

Now this does something different:

  git -c pull.ff=only pull --merge

*And* the new behavior is not documented anywhere.

-- 
Felipe Contreras