Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > When the user has specified "pull.mode=ff-only", the command dies with: > > The pull was not fast-forward, please either merge or rebase. > > When the user has not specified any mode (by default), the command > would output a warning: > > The pull was not fast-forward, in the future you will have to choose a > merge, or a rebase. I quite don't get it. They say the same thing. At that point the user needs to choose between merge and rebase to move forward and ff-only would not be a sensible choice to offer the user. > Just to put this series in context: it's only part 1; it does not > introduce pull.mode, and it doesn't make --ff-only the default. I'd view the "in a non-fast-forward situation, the warning kicks in to those who haven't chosen between merge and rebase (i.e. no pull.rebase set to either true or false, and pull.ff not set to only), which is a bit more gentle than the current situtation" a good stopping point. That state is already making ff-only the default for unconfigured users, or you can view it as shipping "git pull" in a shape that has the more dangerous half of its feature disabled to avoid hurting users. So I am not sure why you keep saying you do not have --ff-only as the default.
