Introduce merge.ff configuration handling

When the provided `FastForwardStrategy` is `FastForwardStrategy.Default`, honor the `merge.ff` configuration setting.  When `merge.ff=only`, enable fast-forward only mode; when `merge.ff=false`, enable no-ff mode.
@ethomson Could you please consider @carlosmn's comment?