Re: git merge <tag> behavior

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.
+