Add 'only' as the default ff strategy for merge.
Add 'only' as the default ff strategy for merge.

Having `ff = false` leads to pretty ugly commit histories. I am going to
try and use `ff = only` to keep the history cleaner.

KyleOndy/dotfiles,KyleOndy/dotfiles,KyleOndy/dotfiles,KyleOndy/.dotfiles