On Mon, Nov 23, 2020 at 02:34:18PM -0600, Felipe Contreras wrote: > > > Which is why I suggested to make fast-forward-only the default: > > > > > > https://lore.kernel.org/git/1398988808-29678-1-git-send-email-felipe.contreras@xxxxxxxxx/ > > > > > > In what case would that default not be what most people want? > > > > Well, it *was* the default, previously, IIRC. > > 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. The default has continued to be merging. If we were going to switch that to bailing out and doing nothing with a warning, I agree that doing so only in the non-fast-forward case would be much better (because in that case, all three modes have the same result). I don't recall whether there is any active plan to move away from the merge default, though. -Peff
