Autogenerated HTML docs for v1.7.0.2-199-g90a2b

1 files changed, 16 insertions, 2 deletions

diff --git a/git-am.html b/git-am.html
index 4908e51ac..ab813e4c1 100644
--- a/git-am.html
+++ b/git-am.html
@@ -321,7 +321,7 @@ git-am(1) Manual Page
 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8]

+<div class="content"><em>git am</em> [--signoff] [--keep] [--keep-cr | --no-keep-cr] [--utf8 | --no-utf8]

          [--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;]

@@ -372,6 +372,20 @@ current branch.</p></div>
 </p>

 </dd>

 <dt>

+--keep-cr

+</dt>

+<dt>

+--no-keep-cr

+</dt>

+<dd>

+<p>

+        With <tt>--keep-cr</tt>, call <em>git mailsplit</em> (see <a href="git-mailsplit.html">git-mailsplit(1)</a>)

+        with the same option, to prevent it from stripping CR at the end of

+        lines. <tt>am.keepcr</tt> configuration variable can be used to specify the

+        default behaviour.  <tt>--no-keep-cr</tt> is useful to override <tt>am.keepcr</tt>.

+</p>

+</dd>

+<dt>

 -c

 </dt>

 <dt>

@@ -639,7 +653,7 @@ errors in the "From:" lines).</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-03-05 07:36:25 UTC

+Last updated 2010-03-11 01:17:13 UTC

 </div>

 </div>

 </body>