summaryrefslogtreecommitdiffstats
path: root/git-mailinfo.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-06-14 05:18:25 +0000
committerJunio C Hamano <junio@kernel.org>2010-06-14 05:18:25 +0000
commitd8c8c56bf052283da2c10ff67e07df11ae814deb (patch)
treeebe5123dd8062f26719ffd69d672ec3ee5fa9523 /git-mailinfo.txt
parenta574a0905e5c1cf6915624561a011e486cccc25d (diff)
downloadgit-htmldocs-d8c8c56bf052283da2c10ff67e07df11ae814deb.tar.gz
Autogenerated HTML docs for v1.7.1-333-g6339f67
Diffstat (limited to 'git-mailinfo.txt')
-rw-r--r--git-mailinfo.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-mailinfo.txt b/git-mailinfo.txt
index e3d58cbac..3ea5aad56 100644
--- a/git-mailinfo.txt
+++ b/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
- 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>::
- 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.