On Mon, Nov 23, 2020 at 6:39 PM Jeff King <peff@xxxxxxxx> wrote: > On Mon, Nov 23, 2020 at 04:55:31PM -0600, Felipe Contreras wrote: > > On Mon, Nov 23, 2020 at 3:48 PM Jeff King <peff@xxxxxxxx> wrote: > > > 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. > > Perhaps I don't understand the distinction you are making. I have > pull.ff=ff set, and I get: You mean "pull.ff=only" ? > $ git pull Try the same thing with "pull.rebase=true". > Which sounds like the same thing, modulo the error message not being > nearly as helpful (which I would be happy to see rectified). > > Is there some other difference you're thinking of? It's mainly the error message, but also the fact that pull.ff is ignored when rebasing. Additionally, using "pull.mode=default", I introduced the following warning: The pull was not fast-forward, in the future you would have to choose a merge or a rebase, falling back to old style for now (git pull --merge). Read 'git pull --help' for more information." Which was triggered *only* when pull.mode wasn't set, *and* the merge wasn't fast-forward. This warning would have been much better than what we have now. I think. Cheers. -- Felipe Contreras
