Skip to content

Commit e0a9110

Browse files
r0bertzgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 74e42ce commit e0a9110

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Documentation/git-mailinfo.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ OPTIONS
4040
-u::
4141
The commit log message, author name and author email are
4242
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
4445
them. This used to be optional but now it is the default.
4546
+
4647
Note that the patch is always used as-is without charset
4748
conversion, even with this flag.
4849

4950
--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.
5353

5454
-n::
5555
Disable all charset re-coding of the metadata.

0 commit comments

Comments
 (0)