Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.

[git.git] / Documentation / git-send-email.txt

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 9bb598b38890b48a779a756b8abdd1e00c9b007c..9d0a10c562c40f0992eb1105cf7543b8813f11b5 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -96,11 +96,40 @@ The --cc option must be repeated for each user you want on the cc list.
        servers typically listen to smtp port 25 and ssmtp port
        465).
 
        servers typically listen to smtp port 25 and ssmtp port
        465).
 

---smtp-user, --smtp-pass::
-       Username and password for SMTP-AUTH. Defaults are the values of
-       the configuration values 'sendemail.smtpuser' and
-       'sendemail.smtppass', but see also 'sendemail.identity'.
-       If not set, authentication is not attempted.
+--smtp-user::
+       Username for SMTP-AUTH. In place of this option, the following
+       configuration variables can be specified:
++
+--
+               * sendemail.smtpuser
+               * sendemail.<identity>.smtpuser (see sendemail.identity).
+--
++
+However, --smtp-user always overrides these variables.
++
+If a username is not specified (with --smtp-user or a
+configuration variable), then authentication is not attempted.
+
+--smtp-pass::
+       Password for SMTP-AUTH. The argument is optional: If no
+       argument is specified, then the empty string is used as
+       the password.
++
+In place of this option, the following configuration variables
+can be specified:
++
+--
+               * sendemail.smtppass
+               * sendemail.<identity>.smtppass (see sendemail.identity).
+--
++
+However, --smtp-pass always overrides these variables.
++
+Furthermore, passwords need not be specified in configuration files
+or on the command line. If a username has been specified (with
+--smtp-user or a configuration variable), but no password has been
+specified (with --smtp-pass or a configuration variable), then the
+user is prompted for a password while the input is masked for privacy.

 
 --smtp-ssl::
        If set, connects to the SMTP server using SSL.
 
 --smtp-ssl::
        If set, connects to the SMTP server using SSL.


@@ -187,6 +216,9 @@ sendemail.chainreplyto::
 sendemail.smtpserver::
        Default SMTP server to use.
 
 sendemail.smtpserver::
        Default SMTP server to use.
 

+sendemail.smtpserverport::
+       Default SMTP server port to use.
+

 sendemail.smtpuser::
        Default SMTP-AUTH username.
 
 sendemail.smtpuser::
        Default SMTP-AUTH username.