summaryrefslogtreecommitdiffstats
path: root/git-am.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-01-16 13:19:04 -0800
committerJunio C Hamano <gitster@pobox.com>2023-01-16 13:19:04 -0800
commitd2309374057e387bf3b3f77ed51de90c6f1af162 (patch)
treea15f0f4e987a56b325efb7dc0ab40794bd0ee777 /git-am.html
parent7657f149df9d40ac2a9193b88f2e7f0b7c9dc532 (diff)
downloadgit-htmldocs-d2309374057e387bf3b3f77ed51de90c6f1af162.tar.gz
Autogenerated HTML docs for v2.39.0-227-g262c45
Diffstat (limited to 'git-am.html')
-rw-r--r--git-am.html17
1 files changed, 15 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html
index 80b372af4..62a67441f 100644
--- a/git-am.html
+++ b/git-am.html
@@ -749,7 +749,7 @@ git-am(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git am</em> [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
+<pre class="content"><em>git am</em> [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
[--[no-]3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
@@ -1024,6 +1024,19 @@ default. You can use <code>--no-utf8</code> to override this.</p></div>
</p>
</dd>
<dt class="hdlist1">
+-n
+</dt>
+<dt class="hdlist1">
+--no-verify
+</dt>
+<dd>
+<p>
+ By default, the pre-applypatch and applypatch-msg hooks are run.
+ When any of <code>--no-verify</code> or <code>-n</code> is given, these are bypassed.
+ See also <a href="githooks.html">githooks(5)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
--committer-date-is-author-date
</dt>
<dd>
@@ -1273,7 +1286,7 @@ am.threeWay
<div id="footer">
<div id="footer-text">
Last updated
- 2022-09-15 05:23:11 JST
+ 2023-01-16 13:16:56 PST
</div>
</div>
</body>