rowanj/gitx — pull request #416 by szayat (2014-12-01 22:11:38+00:00)
Title: Do not automatically fast-forward branches when merging.

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