summaryrefslogtreecommitdiffstats
path: root/git-am.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-22 14:41:44 -0700
committerJunio C Hamano <gitster@pobox.com>2020-04-22 14:41:44 -0700
commit67bf224a9fb3cd34ef712113c48f3144a9bc232a (patch)
treeb3406220064904e5c16814c16b29375806646762 /git-am.html
parent0c3c56d58eecca238d9219bfe80754e089939b99 (diff)
downloadgit-htmldocs-67bf224a9fb3cd34ef712113c48f3144a9bc232a.tar.gz
Autogenerated HTML docs for v2.26.2-266-ge8703
Diffstat (limited to 'git-am.html')
-rw-r--r--git-am.html9
1 files changed, 7 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html
index 8273816ee..135601323 100644
--- a/git-am.html
+++ b/git-am.html
@@ -1034,11 +1034,16 @@ default. You can use <code>--no-utf8</code> to override this.</p></div>
<dt class="hdlist1">
--gpg-sign[=&lt;keyid&gt;]
</dt>
+<dt class="hdlist1">
+--no-gpg-sign
+</dt>
<dd>
<p>
GPG-sign commits. The <code>keyid</code> argument is optional and
defaults to the committer identity; if specified, it must be
- stuck to the option without a space.
+ stuck to the option without a space. <code>--no-gpg-sign</code> is useful to
+ countermand both <code>commit.gpgSign</code> configuration variable, and
+ earlier <code>--gpg-sign</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1193,7 +1198,7 @@ information.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 08:03:13 PDT
+ 2020-04-22 14:37:28 PDT
</div>
</div>
</body>