On Tue, Nov 24, 2020 at 3:11 PM Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > > Before making "pull.ff=only" the default, we need a transitional > period in which if it's unset, a warning is printed when pulling a > non-fast-forward branch. This is what my patch did several years ago. We'd only need a warning if both pull.ff and pull.rebase are unset, since that's the only situation where the behavior would change. And providentially, we already have a warning in that exact case, although we should probably tweak it to explain what the new behavior is going to be :-) > And yes, it should be possible to do what you suggest, but have you > tried? I suspect both the code and the documentation would be quite > convoluted. Yes, I have written a very simple patch that implements the behavior that I am suggesting. I will send it to the mailing list later tonight. -Alex
