Autogenerated HTML docs for v1.4.4.4-g1295

1 files changed, 26 insertions, 4 deletions

diff --git a/git-am.html b/git-am.html
index b26e4b4ea..c06f394cf 100644
--- a/git-am.html
+++ b/git-am.html
@@ -273,7 +273,7 @@ git-am(1) Manual Page
 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--utf8] [--binary] [--3way]

+<div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--utf8 | --no-utf8] [--binary] [--3way]

          [--interactive] [--whitespace=&lt;option&gt;] &lt;mbox&gt;&#8230;

 <em>git-am</em> [--skip | --resolved]</div></div>

 </div>

@@ -305,11 +305,33 @@ current branch.</p>
 </p>

 </dd>

 <dt>

---utf8, --keep

+--keep

 </dt>

 <dd>

 <p>

-        Pass <tt>-u</tt> and <tt>-k</tt> flags to <tt>git-mailinfo</tt> (see

+        Pass <tt>-k</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).

+</p>

+</dd>

+<dt>

+--utf8

+</dt>

+<dd>

+<p>

+        Pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).

+        The proposed commit log message taken from the e-mail

+        are re-coded into UTF-8 encoding (configuration variable

+        <tt>i18n.commitencoding</tt> can be used to specify project's

+        preferred encoding if it is not UTF-8).

+</p>

+<p>This was optional in prior versions of git, but now it is the

+default.   You could use <tt>--no-utf8</tt> to override this.</p>

+</dd>

+<dt>

+--no-utf8

+</dt>

+<dd>

+<p>

+        Do not pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see

         <a href="git-mailinfo.html">git-mailinfo(1)</a>).

 </p>

 </dd>

@@ -418,7 +440,7 @@ names.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 03-Oct-2006 08:40:50 UTC

+Last updated 09-Jan-2007 11:13:40 UTC

 </div>

 </div>

 </body>