summaryrefslogtreecommitdiff
path: root/Documentation/git-mailinfo.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-10 05:31:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-10 05:32:49 (GMT)
commitbb1091a47516f898b757f897b8b398c84343a4e1 (patch)
treeca97aa37380489c955736855eec8054d1622fe87 /Documentation/git-mailinfo.txt
parent62c89c662fc6220522adc009aa95b1392350ed20 (diff)
downloadgit-bb1091a47516f898b757f897b8b398c84343a4e1.zip
git-bb1091a47516f898b757f897b8b398c84343a4e1.tar.gz
git-bb1091a47516f898b757f897b8b398c84343a4e1.tar.bz2
-u is now default for 'git-mailinfo'.
Originally from David Woodhouse, but also adjusts the callers of mailinfo to the new default. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-mailinfo.txt')
-rw-r--r--Documentation/git-mailinfo.txt16
1 files changed, 7 insertions, 9 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index ea0a065..5088bbe 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -33,15 +33,13 @@ OPTIONS
format-patch --mbox' output.
-u::
- By default, the commit log message, author name and
- author email are taken from the e-mail without any
- charset conversion, after minimally decoding MIME
- transfer encoding. This flag causes the resulting
- commit to be encoded in the encoding specified by
- i18n.commitencoding configuration (defaults to utf-8) by
- transliterating them.
- Note that the patch is always used as is without charset
- conversion, even with this flag.
+ 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
+ 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