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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html