On Wed, Dec 09, 2020 at 01:28:48PM -0800, Junio C Hamano wrote: > > A spot check: do you have pull.rebase set to anything in your > config? FWIW, I haven't set pull.rebase to anything, but what I have done is to simply added --ff-only or --rebase to my "git pull" commands. I type fast, though, so it's not that a big deal, and I like the fact that the warning is making me explicitly express what it is that I want to have happen. It's also true that very often, I end up running "git fetch", then look at what I got pulled down, and only then run either "git merge" or "git merge --ff-only" or "git rebase" explicitly. Cheers, - Ted
