Lukas SandströmSigned-off-by: Lukas Sandström <lukass@etek.chalmers.se> --- Documentation/git-mailinfo.txt | 5 ++++- builtin-mailinfo.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
Show changes to 2 files +5 −2
Documentation/git-mailinfo.txt, builtin-mailinfo.c
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index cc52db3..316bcc6 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -8,7 +8,7 @@ git-mailinfo - Extracts patch and authorship from a single e-mail message SYNOPSIS -------- -'git mailinfo' [-k] [-u | --encoding=<encoding>] <msg> <patch> +'git mailinfo' [-k] [-u | --encoding=<encoding> | -n] <msg> <patch> DESCRIPTION @@ -46,6 +46,9 @@ conversion, even with this flag. from what is specified by i18n.commitencoding, this flag can be used to override it. +-n:: + Disable all charset re-coding of the metadata. + <msg>:: The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject. diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c index fa6e8f9..962aa34 100644 --- a/builtin-mailinfo.c +++ b/builtin-mailinfo.c @@ -960,7 +960,7 @@ static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding, } static const char mailinfo_usage[] = - "git-mailinfo [-k] [-u | --encoding=<encoding>] msg patch <mail >info"; + "git-mailinfo [-k] [-u | --encoding=<encoding> | -n] msg patch <mail >info"; int cmd_mailinfo(int argc, const char **argv, const char *prefix) {
-- 1.5.4.5