X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-mailinfo.txt;h=31eccea5bc0697ee461503734942429c2133ef3f;hb=6d14414d21973580547ca1935b2692a43c0b0b5f;hp=183dc1dd75c1268b199257496ac778e0d5dd7743;hpb=8de7e9c07e199bd4d856a9360f8865f0d5fde3eb;p=git.git diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index 183dc1dd7..31eccea5b 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=] +'git mailinfo' [-k] [-u | --encoding= | -n] DESCRIPTION @@ -16,7 +16,7 @@ DESCRIPTION Reading a single e-mail message from the standard input, and writes the commit log message in file, and the patches in file. The author name, e-mail and e-mail subject are -written out to the standard output to be used by git-am +written out to the standard output to be used by 'git-am' to create a commit. It is usually not necessary to use this command directly. See linkgit:git-am[1] instead. @@ -29,8 +29,8 @@ OPTIONS among which (1) remove 'Re:' or 're:', (2) leading whitespaces, (3) '[' up to ']', typically '[PATCH]', and then prepends "[PATCH] ". This flag forbids this - munging, and is most useful when used to read back 'git - format-patch -k' output. + munging, and is most useful when used to read back + 'git-format-patch -k' output. -u:: The commit log message, author name and author email are @@ -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. + :: The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject. @@ -57,7 +60,7 @@ conversion, even with this flag. Author ------ Written by Linus Torvalds and -Junio C Hamano +Junio C Hamano Documentation