Your comments

If I were implementing this, the settings could have three possible options:

When checking out:

  Always fast-forward-merge

  Never fast-forward-merge (just checkout)

  Ask

With Ask as the default setting, because that's the current behaviour.