summaryrefslogtreecommitdiffstats
path: root/git-am.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-08-22 05:10:47 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-08-22 05:10:47 +0000
commitfe24db05d4bb032effbd10c0ef1e4ad11d09c07c (patch)
tree3a575878892ba149206ecb05915d300634fc0828 /git-am.html
parent0df868a88d19f43e96bbc693a53567a4219ed96b (diff)
downloadgit-htmldocs-fe24db05d4bb032effbd10c0ef1e4ad11d09c07c.tar.gz
Autogenerated HTML docs for v1.6.4.1-174-g32f4c
Diffstat (limited to 'git-am.html')
-rw-r--r--git-am.html13
1 files changed, 11 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html
index 9f1fbc50c..aac18d3a4 100644
--- a/git-am.html
+++ b/git-am.html
@@ -323,7 +323,7 @@ git-am(1) Manual Page
<div class="verseblock">
<div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive] [--committer-date-is-author-date]
- [--ignore-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]
[&lt;mbox&gt; | &lt;Maildir&gt;&#8230;]
@@ -423,6 +423,15 @@ default. You can use <tt>--no-utf8</tt> to override this.</p></div>
</p>
</dd>
<dt>
+--ignore-date
+</dt>
+<dt>
+--ignore-space-change
+</dt>
+<dt>
+--ignore-whitespace
+</dt>
+<dt>
--whitespace=&lt;option&gt;
</dt>
<dt>
@@ -609,7 +618,7 @@ errors in the "From:" lines).</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-07-02 03:16:40 UTC
+Last updated 2009-08-22 05:10:25 UTC
</div>
</div>
</body>