From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Wed, 21 Jul 2021 12:25:47 GMT
Subject: RE: [PATCH v2 3/8] pull: abort if --ff-only is given and fast-forwarding is impossible
Message-ID: <60f8124b341c2_1305dc2081@natae.notmuch>
In-Reply-To: <c45cd2396664e915a1d962e6d131505df51b118e.1626831744.git.gitgitgadget@gmail.com>

Alex Henrie via GitGitGadget wrote:
> From: Alex Henrie <alexhenrie24@gmail.com>
> 
> The warning about pulling without specifying how to reconcile divergent
> branches says that after setting pull.rebase to true, --ff-only can
> still be passed on the command line to require a fast-forward. Make that
> actually work.

This is a backwards-incompatible change.

-- 
Felipe Contreras