summaryrefslogtreecommitdiffstats
path: root/git-am.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-14 03:13:27 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-14 03:13:27 +0000
commit46a38aa8be7b8f7b5afdeeea0744859b3e03d5a2 (patch)
tree109cac450de2a01929e22f1db123b486d14a7d25 /git-am.html
parent208beb7160e9d42ed3938d959525e6d89c642e39 (diff)
downloadgit-htmldocs-46a38aa8be7b8f7b5afdeeea0744859b3e03d5a2.tar.gz
Autogenerated HTML docs for v1.5.6.3-315-g10ce0
Diffstat (limited to 'git-am.html')
-rw-r--r--git-am.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-am.html b/git-am.html
index 7fcfa1333..b913f1ad2 100644
--- a/git-am.html
+++ b/git-am.html
@@ -324,8 +324,8 @@ git-am(1) Manual Page
<div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive] [--binary]
[--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;]
- &lt;mbox&gt;|&lt;Maildir&gt;&#8230;
-<em>git am</em> [--skip | --resolved]</div></div>
+ [&lt;mbox&gt; | &lt;Maildir&gt;&#8230;]
+<em>git am</em> (--skip | --resolved)</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -572,7 +572,7 @@ names.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:16:34 UTC
+Last updated 2008-07-14 03:12:28 UTC
</div>
</div>
</body>