From: Max Nanasy <max.nanasy@gmail.com>
Date: Thu, 21 Mar 2013 20:31:30 GMT
Subject: Re: git merge <tag> behavior
Message-ID: <loom.20130321T212911-611@post.gmane.org>
In-Reply-To: <1363704914.6289.39.camel@test.quest-ce.net>

Yann Droneaud <ydroneaud <at> opteya.com> writes:

> 
> 3) Merge options can't be overridden.
> 
> If I modify .git/config to set a merge option, for example forcing
> fast-forward merge, this option cannot be overridden on command line:
> 

(git merge --no-ff-only --no-ff) should work.  The --no-ff-only overrides
the --ff-only configuration setting, and the --no-ff ensures that the merge
is not a fast-forward.