Git 2.23-rc1

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 92a7d936c1a8fbcc6746a0ddd127e131edb8f2c1..79a00d2a4abd6f7191f2639185e199fa85f6289b 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -32,6 +32,13 @@ they run `git merge`. To make it easier to adjust such scripts to the
 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. 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
        pointer, without creating a merge commit.  This is the default
@@ -95,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>::