diff options
| -rw-r--r-- | Documentation/git-mailinfo.txt | 11 | ||||
| -rw-r--r-- | mailinfo.c | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index dc7d725ea1..8890754740 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. diff --git a/mailinfo.c b/mailinfo.c index de105acaa8..890e3487ad 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -717,7 +717,7 @@ static void handle_body(void) } static const char mailinfo_usage[] = - "git-mailinfo [-k] [-u] msg patch <mail >info"; + "git-mailinfo [-k] [-u | --encoding=<encoding>] msg patch <mail >info"; int main(int argc, char **argv) { @@ -731,8 +731,8 @@ int main(int argc, char **argv) keep_subject = 1; else if (!strcmp(argv[1], "-u")) metainfo_charset = git_commit_encoding; - else if (!strncmp(argv[1], "-u=", 3)) - metainfo_charset = argv[1] + 3; + else if (!strncmp(argv[1], "--encoding=", 11)) + metainfo_charset = argv[1] + 11; else usage(mailinfo_usage); argc--; argv++; |