summaryrefslogtreecommitdiffstats
path: root/git-am.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-08-19 06:50:43 +0000
committerJunio C Hamano <junio@kernel.org>2011-08-19 06:50:43 +0000
commitdac21e7333da9c0b88a8a90a04ba0b3c3a195223 (patch)
tree1bdc79b44d5a8edfc24d7aff57b7a130dea928da /git-am.html
parentf727901f143d965c00ad283c9cfaee214464e9fd (diff)
downloadgit-htmldocs-dac21e7333da9c0b88a8a90a04ba0b3c3a195223.tar.gz
Autogenerated HTML docs for v1.7.6-557-gcee4
Diffstat (limited to 'git-am.html')
-rw-r--r--git-am.html8
1 files changed, 6 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html
index 87189052f..64b2c9460 100644
--- a/git-am.html
+++ b/git-am.html
@@ -419,7 +419,8 @@ git-am(1) Manual Page
[--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;]
- [--reject] [-q | --quiet] [--scissors | --no-scissors]
+ [--exclude=&lt;path&gt;] [--reject] [-q | --quiet]
+ [--scissors | --no-scissors]
[(&lt;mbox&gt; | &lt;Maildir&gt;)&#8230;]
<em>git am</em> (--continue | --skip | --abort)</div>
<div class="verseblock-attribution">
@@ -574,6 +575,9 @@ default. You can use <tt>--no-utf8</tt> to override this.</p></div>
--directory=&lt;dir&gt;
</dt>
<dt class="hdlist1">
+--exclude=&lt;path&gt;
+</dt>
+<dt class="hdlist1">
--reject
</dt>
<dd>
@@ -741,7 +745,7 @@ errors in the "From:" lines).</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-23 00:05:17 UTC
+Last updated 2011-08-19 06:50:18 UTC
</div>
</div>
</body>