Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc

[git.git] / Documentation / git-mailinfo.txt

diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index cc52db3befda556a92b225539de0a9b95a1bf96c..31eccea5bc0697ee461503734942429c2133ef3f 100644 (file)
--- 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
 --------
 
 SYNOPSIS
 --------

-'git mailinfo' [-k] [-u | --encoding=<encoding>] <msg> <patch>
+'git mailinfo' [-k] [-u | --encoding=<encoding> | -n] <msg> <patch>

 
 
 DESCRIPTION
 
 
 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.
 
        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.
 <msg>::
        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 <torvalds@osdl.org> and
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and

-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>

 
 
 Documentation
 
 
 Documentation