http/ftp: optionally ask curl to not use EPSV command

diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index eb3a3d1be7e6d45686408882ae16c5608faa8476..ea0a06557f933ce48374ddbb751a64945ff65955 100644 (file)
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -3,12 +3,12 @@ git-mailinfo(1)
 
 NAME
 ----
-git-mailinfo - Extracts patch from a single e-mail message.
+git-mailinfo - Extracts patch from a single e-mail message
 
 
 SYNOPSIS
 --------
-'git-mailinfo' [-k] [-u] <msg> <patch>
+'git-mailinfo' [-k] [-u | --encoding=<encoding>] <msg> <patch>
 
 
 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
-       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.
 
+--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.
@@ -61,5 +68,5 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite