summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-06 15:50:20 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-06 15:50:20 +0900
commit8ac6990b8712cb7c44dfc4ff8d9e99b5ec55b01d (patch)
treea8e00092967a8457f23e9773caf81500d397f458 /Documentation
parentMerge branch 'nd/submodule-unused-vars' (diff)
parentsend-email: explicitly disable authentication (diff)
downloadtgif-8ac6990b8712cb7c44dfc4ff8d9e99b5ec55b01d.tar.xz
Merge branch 'jw/send-email-no-auth'
"git send-email" learned to disable SMTP authentication via the "--smtp-auth=none" option, even when the smtp username is given (which turns the authentication on by default). * jw/send-email-no-auth: send-email: explicitly disable authentication
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-send-email.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index f6010ac68b..62c6c76f27 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -190,7 +190,9 @@ $ git send-email --smtp-auth="PLAIN LOGIN GSSAPI" ...
If at least one of the specified mechanisms matches the ones advertised by the
SMTP server and if it is supported by the utilized SASL library, the mechanism
is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth`
-is specified, all mechanisms supported by the SASL library can be used.
+is specified, all mechanisms supported by the SASL library can be used. The
+special value 'none' maybe specified to completely disable authentication
+independently of `--smtp-user`
--smtp-pass[=<password>]::
Password for SMTP-AUTH. The argument is optional: If no
@@ -204,6 +206,9 @@ or on the command line. If a username has been specified (with
specified (with `--smtp-pass` or `sendemail.smtpPass`), then
a password is obtained using 'git-credential'.
+--no-smtp-auth::
+ Disable SMTP authentication. Short hand for `--smtp-auth=none`
+
--smtp-server=<host>::
If set, specifies the outgoing SMTP server to use (e.g.
`smtp.example.com` or a raw IP address). Alternatively it can