From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Wed, 21 Jul 2021 12:26:41 GMT
Subject: RE: [PATCH v2 5/8] pull: make --rebase and --no-rebase override pull.ff=only
Message-ID: <60f812818d139_1305dc20895@natae.notmuch>
In-Reply-To: <9b116f3d284840052945292f73c47bacdb2f86d6.1626831744.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.

Once again, this breaks existing behavior.

-- 
Felipe Contreras