Autogenerated HTML docs for v1.7.1-333-g6339f67

1 files changed, 5 insertions, 5 deletions

diff --git a/git-mailinfo.html b/git-mailinfo.html
index 04875b4e0..1a0ee19e9 100644
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -365,7 +365,8 @@ command directly.  See <a href="git-am.html">git-am(1)</a> instead.</p></div>
 <p>

         The commit log message, author name and author email are

         taken from the e-mail, and after minimally decoding MIME

-        transfer encoding, re-coded in UTF-8 by transliterating

+        transfer encoding, re-coded in the charset specified by

+        i18n.commitencoding (defaulting to UTF-8) by transliterating

         them.  This used to be optional but now it is the default.

 </p>

 <div class="para"><p>Note that the patch is always used as-is without charset

@@ -376,9 +377,8 @@ conversion, even with this flag.</p></div>
 </dt>

 <dd>

 <p>

-        Similar to -u but if the local convention is different

-        from what is specified by i18n.commitencoding, this flag

-        can be used to override it.

+        Similar to -u.  But when re-coding, the charset specified here is

+        used instead of the one specified by i18n.commitencoding or UTF-8.

 </p>

 </dd>

 <dt>

@@ -450,7 +450,7 @@ Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-04-24 02:56:00 UTC

+Last updated 2010-06-14 05:18:11 UTC

 </div>

 </div>

 </body>