summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-11-04 13:22:31 -0700
committerJunio C Hamano <gitster@pobox.com>2021-11-04 13:22:31 -0700
commit5dbbd5d18acacd0b16ea751a14f209ff5d231eb6 (patch)
tree351ad95dbfa4aa1c1aa4d1ba1da5f39db1aa2fb9 /git-pull.html
parent9e5ea002d7611df71e40a292f873d9ed30ec578f (diff)
downloadgit-htmldocs-5dbbd5d18acacd0b16ea751a14f209ff5d231eb6.tar.gz
Autogenerated HTML docs for v2.34.0-rc1-14-g88d91
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html
index 889a23d0a..bd5987a82 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1036,11 +1036,12 @@ option can be used to override --squash.</p></div>
<div class="paragraph"><p>Only useful when merging.</p></div>
</dd>
<dt class="hdlist1">
---no-verify
+--[no-]verify
</dt>
<dd>
<p>
- This option bypasses the pre-merge and commit-msg hooks.
+ By default, the pre-merge and commit-msg hooks are run.
+ When <code>--no-verify</code> is given, these are bypassed.
See also <a href="githooks.html">githooks(5)</a>.
Only useful when merging.
</p>