git-mailinfo documentation: clarify -u/--encoding
Instead of talking about hardcoded UTF-8, describe i18n.commitencoding and the --encoding option, and state that they default to UTF-8. Signed-off-by: Zhang Le <r0bertz@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Zhang Le committed
Jun 14, 2010 at 02:49 UTC
e0a9110176e3b17414b1b38fae8febd0791eaa0c
1 file changed
+4
-4
Documentation/git-mailinfo.txt
+4
-4
@@ -40,16 +40,16 @@ OPTIONS
40
-u::
41
The commit log message, author name and author email are
42
taken from the e-mail, and after minimally decoding MIME
43
- transfer encoding, re-coded in UTF-8 by transliterating
43
+ transfer encoding, re-coded in the charset specified by
44
+ i18n.commitencoding (defaulting to UTF-8) by transliterating
45
them. This used to be optional but now it is the default.
46
+
47
Note that the patch is always used as-is without charset
48
conversion, even with this flag.
49
50
--encoding=<encoding>::
50
- Similar to -u but if the local convention is different
51
- from what is specified by i18n.commitencoding, this flag
52
- can be used to override it.
51
+ Similar to -u. But when re-coding, the charset specified here is
52
+ used instead of the one specified by i18n.commitencoding or UTF-8.
53
54
-n::
55
Disable all charset re-coding of the metadata.