On Mon, Nov 23, 2020 at 1:15 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > Vít Ondruch <vondruch@xxxxxxxxxx> writes: > > While I understand that the merge after `git pull` is probably not the > > best strategy (as explained in [1]), asking people to change their > > configuration to choose their default strategy with every `git pull` > > is not any better. > > There is no clear "default that would suit everybody". This is a false dichotomy. Yes, there's no default that would suit everybody, but there is a better default than the current one: fast-forward-only: https://lore.kernel.org/git/1398988808-29678-1-git-send-email-felipe.contreras@xxxxxxxxx/ -- Felipe Contreras
