From: Yann Droneaud <ydroneaud@opteya.com>
Date: Wed, 22 May 2013 13:36:50 GMT
Subject: Re: override merge.ff = false using --ff-only
Message-ID: <428ac6eff0b1a118a9b09f0835ab65b5@meuh.org>
In-Reply-To: <CAJELnLFqzVBd57vudsCFrTNMVxETO75GT5T5NO0sDMtgHZJU6g@mail.gmail.com>

Hi,

Le 22.05.2013 15:21, Matt McClure a écrit :
> I naively tried to override merge.ff = false using --ff-only on the
> command line. I expected that it would override the configured 
> default
> and perform a fast-forward merge. Instead, it said:
>
>     $ git config -l | grep -F 'merge.ff'
>     merge.ff=false
>
>     $ git merge --ff-only foo
>     fatal: You cannot combine --no-ff with --ff-only.
>
> On the other hand, I see that --ff works just fine in the same 
> initial state.
>

You might want to read the following messages from thread "git merge 
<tag> behavior"

http://article.gmane.org/gmane.comp.version-control.git/218519
http://article.gmane.org/gmane.comp.version-control.git/218755
http://article.gmane.org/gmane.comp.version-control.git/218786


Regards.

-- 
Yann Droneaud
OPTEYA