Merge branch 'maint'

* maint:
  git-mailinfo documentation: clarify -u/--encoding
This commit is contained in:
Junio C Hamano 2010-06-13 21:02:16 -07:00
commit 6339f67fed

View File

@ -40,16 +40,16 @@ OPTIONS
-u:: -u::
The commit log message, author name and author email are The commit log message, author name and author email are
taken from the e-mail, and after minimally decoding MIME 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. them. This used to be optional but now it is the default.
+ +
Note that the patch is always used as-is without charset Note that the patch is always used as-is without charset
conversion, even with this flag. conversion, even with this flag.
--encoding=<encoding>:: --encoding=<encoding>::
Similar to -u but if the local convention is different Similar to -u. But when re-coding, the charset specified here is
from what is specified by i18n.commitencoding, this flag used instead of the one specified by i18n.commitencoding or UTF-8.
can be used to override it.
-n:: -n::
Disable all charset re-coding of the metadata. Disable all charset re-coding of the metadata.