summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-18 12:30:01 -0700
committerJunio C Hamano <gitster@pobox.com>2019-09-18 12:30:01 -0700
commitcb705397f111dc1fcb3e3fa844bfd5b3050dee38 (patch)
tree7a08f9890ae401f03a3d3fb034c06f1be74e727e /git-pull.html
parent926cc052d4e49ae0c1af3703c87b0d1037d7fbac (diff)
downloadgit-htmldocs-cb705397f111dc1fcb3e3fa844bfd5b3050dee38.tar.gz
Autogenerated HTML docs for v2.23.0-256-g4c861
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html9
1 files changed, 9 insertions, 0 deletions
diff --git a/git-pull.html b/git-pull.html
index 5f06c9783..ac14f42ba 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1018,6 +1018,15 @@ option can be used to override --squash.</p></div>
<div class="paragraph"><p>With --squash, --commit is not allowed, and will fail.</p></div>
</dd>
<dt class="hdlist1">
+--no-verify
+</dt>
+<dd>
+<p>
+ This option bypasses the pre-merge and commit-msg hooks.
+ See also <a href="githooks.html">githooks(5)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
-s &lt;strategy&gt;
</dt>
<dt class="hdlist1">