From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Jul 2013 17:28:34 +0000 (-0700)
Subject: Merge branch 'mv/merge-ff-tristate'
X-Git-Tag: v1.8.4-rc0~58
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9678ee7ba30a76b0b5c613126e659dcb1a206091?hp=--cc

Merge branch 'mv/merge-ff-tristate'

The configuration variable "merge.ff" was cleary a tri-state to
choose one from "favor fast-forward when possible", "always create
a merge even when the history could fast-forward" and "do not
create any merge, only update when the history fast-forwards", but
the command line parser did not implement the usual convention of
"last one wins, and command line overrides the configuration"
correctly.

* mv/merge-ff-tristate:
merge: handle --ff/--no-ff/--ff-only as a tri-state option
---

9678ee7ba30a76b0b5c613126e659dcb1a206091