summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.adoc
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/merge-options.adoc')
-rw-r--r--Documentation/merge-options.adoc3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/merge-options.adoc b/Documentation/merge-options.adoc
index 95ef491be1..9d433265b2 100644
--- a/Documentation/merge-options.adoc
+++ b/Documentation/merge-options.adoc
@@ -135,7 +135,8 @@ ifdef::git-pull[]
Only useful when merging.
endif::git-pull[]
-`--[no-]verify`::
+`--verify`::
+`--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].