merge: allow fast-forward when merging a tracked tag

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 8c74a2ca035bf04c1838f584f450e7ec68e475d9..f970a43422b37159618a96d039e4e9e19804a3b7 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -144,6 +144,8 @@ OPTIONS
        Use the given <msg> as the commit message.
        If multiple `-m` options are given, their values are
        concatenated as separate paragraphs.
++
+The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`.
 
 -t <file>::
 --template=<file>::