From: Yann Droneaud Date: Fri, 22 Mar 2013 09:16:20 GMT Subject: Re: git merge behavior Message-ID: In-Reply-To: Hi, Le 21.03.2013 21:31, Max Nanasy a écrit : > Yann Droneaud 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. > Thanks. I wasn't aware of the --no-ff-only option and thought --no-ff would be the opposite of --ff-only, or at least disable it given the order of the options. Please find a patch to document option --no-ff-only Documentation/merge-options.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 0bcbe0a..20a31cf 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -37,6 +37,10 @@ set to `no` at the beginning of them. current `HEAD` is already up-to-date or the merge can be resolved as a fast-forward. +--no-ff-only:: + Disable `--ff-only` behavior, eg. allows creation of merge commit. + This is the default behavior. + --log[=]:: --no-log:: In addition to branch names, populate the log message with