diff options
author | Junio C Hamano <junkio@cox.net> | 2005-11-28 01:29:52 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-11-28 01:29:52 -0800 |
commit | 9f63892b3803701c97259d51143e199fe9603d3f (patch) | |
tree | cbb481a09bd2ab0e4fa8fc43fe0a910c7fed24fb /Documentation/git-mailinfo.txt | |
parent | f1f909e3185b5ee366e198042447afe749bfc813 (diff) | |
download | git-9f63892b3803701c97259d51143e199fe9603d3f.tar.gz git-9f63892b3803701c97259d51143e199fe9603d3f.tar.xz |
mailinfo: Do not use -u=<encoding>; say --encoding=<encoding>
Specifying the value for a single letter, single dash option
parameter with equal sign looked funny, and more importantly
calling the flag to override encoding from utf-8 to something
else "-u" (obviously abbreviated from "utf-8") did not make any
sense. So spell it out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-mailinfo.txt')
-rw-r--r-- | Documentation/git-mailinfo.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index dc7d725ea..889075474 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -8,7 +8,7 @@ git-mailinfo - Extracts patch from a single e-mail message. SYNOPSIS -------- -'git-mailinfo' [-k] [-u] <msg> <patch> +'git-mailinfo' [-k] [-u | --encoding=<encoding>] <msg> <patch> DESCRIPTION @@ -37,10 +37,17 @@ OPTIONS 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 utf-8 by transliterating them. + 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. +--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. + <msg>:: The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject. |