git-tar-tree: no more void pointer arithmetic

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

diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index dc7d725..ea0a065 100644 (file)
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -3,12 +3,12 @@ git-mailinfo(1)
 
 NAME
 ----
 
 NAME
 ----

-git-mailinfo - Extracts patch from a single e-mail message.
+git-mailinfo - Extracts patch from a single e-mail message

 
 
 SYNOPSIS
 --------
 
 
 SYNOPSIS
 --------

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

 
 
 DESCRIPTION
 
 
 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
        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.
 
        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.
 <msg>::
        The commit log message extracted from e-mail, usually
        except the title line which comes from e-mail Subject.