Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-mailinfo documentation: clarify -u/--encoding
author
Zhang Le
<r0bertz@gentoo.org>
Sun, 13 Jun 2010 18:49:47 +0000
(
02:49
+0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 14 Jun 2010 03:18:23 +0000
(20:18 -0700)
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>
Documentation/git-mailinfo.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
74e42ce
)
diff --git
a/Documentation/git-mailinfo.txt
b/Documentation/git-mailinfo.txt
index e3d58cbac3f162cc01d8731485f220fd70fed17b..3ea5aad56c5e1cec7fc2ca01ba9b5ea6badebe2f 100644
(file)
--- a/
Documentation/git-mailinfo.txt
+++ b/
Documentation/git-mailinfo.txt
@@
-40,16
+40,16
@@
OPTIONS
-u::
The commit log message, author name and author email are
taken from the e-mail, and after minimally decoding MIME
-u::
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.
+
Note that the patch is always used as-is without charset
conversion, even with this flag.
--encoding=<encoding>::
them. This used to be optional but now it is the default.
+
Note that the patch is always used as-is without charset
conversion, even with this flag.
--encoding=<encoding>::
- 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.
-n::
Disable all charset re-coding of the metadata.
-n::
Disable all charset re-coding of the metadata.