Re: Pick the right default and stop warn on `git pull`
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Nov 23, 2020, 22:55 UTC
- Message-ID
- <CAMP44s0QOcMnYQqFFSE1jV_T6=e4=xTM0zr_06C6+aYb7oqb4A@mail.gmail.com>
- In-Reply-To
- <X7wuMvHRURK1QS/Q@coredump.intra.peff.net>
On Mon, Nov 23, 2020 at 3:48 PM Jeff King <peff@peff.net> wrote:
> On Mon, Nov 23, 2020 at 02:34:18PM -0600, Felipe Contreras wrote:
Show 5 quoted lines
> > There has never been a "pull.mode=ff-only" option; that's what I tried > > to introduce. > > There is pull.ff=only these days, which also squelches the message. But > you're right that it was never the default.
But that's not the same thing. The whole point of "pull.mode=ff-only" was to print a message like:
The pull was not fast-forward, please either merge or rebase.
Cheers.
-- Felipe Contreras