Merge branch 'ph/submodule-rebase' (early part)

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

diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 6ebdeee843b314a45b02f791a837f4ec414023bb..8d95aaa30441c36a019e9d3d78ec451fbd40fdaf 100644 (file)
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -8,15 +8,15 @@ 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
 -----------

-Reading a single e-mail message from the standard input, and
+Reads a single e-mail message from the standard input, and

 writes the commit log message in <msg> file, and the patches in
 <patch> file.  The author name, e-mail and e-mail subject are
 writes the commit log message in <msg> file, and the patches in
 <patch> 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.
 
 to create a commit.  It is usually not necessary to use this
 command directly.  See linkgit:git-am[1] instead.
 


@@ -30,7 +30,7 @@ OPTIONS
        whitespaces, (3) '[' up to ']', typically '[PATCH]', and
        then prepends "[PATCH] ".  This flag forbids this
        munging, and is most useful when used to read back
        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.
+       'git-format-patch -k' output.

 
 -u::
        The commit log message, author name and author email are
 
 -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.
 
        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