libgit2/libgit2sharp — pull request #709 by ethomson (2014-05-08 19:25:07+00:00)
Title: 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.