summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-12 00:46:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-12 00:46:36 (GMT)
commite3560df69d5ff8047bb82524ef23f7c08c729b64 (patch)
treef31202c504a360a1de224a8fac6b7d568e7d2d63 /Documentation
parente9356264314677f045e29a62cab605c55edb8a37 (diff)
parent8a7c56e1591ad5593883bb23fb6c5683a8a1a1a8 (diff)
downloadgit-e3560df69d5ff8047bb82524ef23f7c08c729b64.zip
git-e3560df69d5ff8047bb82524ef23f7c08c729b64.tar.gz
git-e3560df69d5ff8047bb82524ef23f7c08c729b64.tar.bz2
Merge branch 'mw/send-email'
* mw/send-email: git-send-email: Better handling of EOF git-send-email: SIG{TERM,INT} handlers git-send-email: ssh/login style password requests
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-send-email.txt39
1 files changed, 34 insertions, 5 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 9bb598b..336d797 100644
--- 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).
---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.