summaryrefslogtreecommitdiffstats
path: root/git-am.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-27 15:07:15 -0800
committerJunio C Hamano <gitster@pobox.com>2014-02-27 15:07:15 -0800
commit5b3533dc1d20a4946b19e379650c2faa5b88c9ec (patch)
tree3bc7b2357c9f22023f51c443d7d07fa87aa8fbf3 /git-am.html
parent616a76d3a7e606b4673a9657b203c03a152e7a63 (diff)
downloadgit-htmldocs-5b3533dc1d20a4946b19e379650c2faa5b88c9ec.tar.gz
Autogenerated HTML docs for v1.9.0-138-g2de34
Diffstat (limited to 'git-am.html')
-rw-r--r--git-am.html15
1 files changed, 13 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html
index 56bf5ee1a..2b595c813 100644
--- a/git-am.html
+++ b/git-am.html
@@ -755,7 +755,7 @@ git-am(1) Manual Page
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
[--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--reject] [-q | --quiet]
- [--[no-]scissors]
+ [--[no-]scissors] [-S[&lt;keyid&gt;]]
[(&lt;mbox&gt; | &lt;Maildir&gt;)&#8230;]
<em>git am</em> (--continue | --skip | --abort)</pre>
<div class="attribution">
@@ -979,6 +979,17 @@ default. You can use <tt>--no-utf8</tt> to override this.</p></div>
</p>
</dd>
<dt class="hdlist1">
+-S[&lt;keyid&gt;]
+</dt>
+<dt class="hdlist1">
+--gpg-sign[=&lt;keyid&gt;]
+</dt>
+<dd>
+<p>
+ GPG-sign commits.
+</p>
+</dd>
+<dt class="hdlist1">
--continue
</dt>
<dt class="hdlist1">
@@ -1101,7 +1112,7 @@ errors in the "From:" lines).</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2014-02-27 15:06:29 PST
</div>
</div>
</body>