Autogenerated HTML docs for v2.23.0-256-g4c861

1 files changed, 11 insertions, 2 deletions

diff --git a/git-merge.html b/git-merge.html
index 2a06436dd..d60cb2c9a 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -750,7 +750,7 @@ git-merge(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]

-        [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;] [-S[&lt;keyid&gt;]]

+        [--no-verify] [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;] [-S[&lt;keyid&gt;]]

         [--[no-]allow-unrelated-histories]

         [--[no-]rerere-autoupdate] [-m &lt;msg&gt;] [-F &lt;file&gt;] [&lt;commit&gt;&#8230;]

 <em>git merge</em> (--continue | --abort | --quit)</pre>

@@ -974,6 +974,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">

@@ -2051,7 +2060,7 @@ branch.&lt;name&gt;.mergeOptions
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2019-07-09 19:51:04 PDT

+ 2019-09-18 12:25:17 PDT

 </div>

 </div>

 </body>