Could we actually describe what the default is? (ie. Favor fast-forward when possible, otherwise create a merge commit)