Merge branch 'rs/parse-options-with-keep-unknown-abbrev-fix'

[thirdparty/git.git] / Documentation / merge-options.txt

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 86f277a9945fd395e86a417cc61173b5a379f445..3eaefc4e940518713e7d140badcd3734ce9abbf0 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -132,8 +132,9 @@ ifdef::git-pull[]
 Only useful when merging.
 endif::git-pull[]
 
---no-verify::
-       This option bypasses the pre-merge and commit-msg hooks.
+--[no-]verify::
+       By default, the pre-merge and commit-msg hooks are run.
+       When `--no-verify` is given, these are bypassed.
        See also linkgit:githooks[5].
 ifdef::git-pull[]
        Only useful when merging.
@@ -144,7 +145,7 @@ endif::git-pull[]
        Use the given merge strategy; can be supplied more than
        once to specify them in the order they should be tried.
        If there is no `-s` option, a built-in list of strategies
-       is used instead (`recursive` when merging a single head,
+       is used instead (`ort` when merging a single head,
        `octopus` otherwise).
 
 -X <option>::
@@ -190,7 +191,7 @@ endif::git-pull[]
 --autostash::
 --no-autostash::
        Automatically create a temporary stash entry before the operation
-       begins, record it in the special ref `MERGE_AUTOSTASH`
+       begins, record it in the ref `MERGE_AUTOSTASH`
        and apply it after the operation ends.  This means
        that you can run the operation on a dirty worktree.  However, use
        with care: the final stash application after a successful