Do not automatically fast-forward branches when merging.

Give the use an option to create an explicit merge commit instead of fast-forward.