git-cola/git-cola — pull request #311 by forfolias (2014-06-24 13:31:01+00:00)
Title: cmds: allow --no-ff command-line argument during merge

Add a checkbox to the Merge dialog to support no-fast-forward during merge