From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Wed, 21 Jul 2021 12:27:27 GMT
Subject: RE: [PATCH v2 6/8] pull: abort by default when fast-forwarding is not possible
Message-ID: <60f812afb2f69_1305dc208c8@natae.notmuch>
In-Reply-To: <f061f8b4e75a42f3c08b0a8fc63ac87c8f8d77ec.1626831744.git.gitgitgadget@gmail.com>

Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
> 
> We have for some time shown a long warning when the user does not
> specify how to reconcile divergent branches with git pull.  Make it an
> error now.

Yes, but the warning doesn't say anything about changing the defaults or
deprecation.

-- 
Felipe Contreras