Merge branch 'js/trace2-signo-typofix' into maint

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index bcf0b3e49c6ff25b78dcd7244bfb671631603929..79a00d2a4abd6f7191f2639185e199fa85f6289b 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -33,8 +33,11 @@ updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be
 set to `no` at the beginning of them.
 
 --cleanup=<mode>::
-       This option determines how the merge message will be cleaned up
-       before commiting. See linkgit:git-commit[1] for more details.
+       This option determines how the merge message will be cleaned up before
+       commiting. See linkgit:git-commit[1] for more details. In addition, if
+       the '<mode>' is given a value of `scissors`, scissors will be appended
+       to `MERGE_MSG` before being passed on to the commit machinery in the
+       case of a merge conflict.
 
 --ff::
        When the merge resolves as a fast-forward, only update the branch
@@ -99,6 +102,8 @@ merge.
 +
 With --no-squash perform the merge and commit the result. This
 option can be used to override --squash.
++
+With --squash, --commit is not allowed, and will fail.
 
 -s <strategy>::
 --strategy=<strategy>::