diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-26 15:45:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-26 15:45:31 -0700 |
| commit | 629ac65f68fb78a6cbff76008326ca38965e1c9a (patch) | |
| tree | cb4d007821b7f2f79f19dc57cbccc0de85ab97e2 /Documentation | |
| parent | Merge branch 'ep/http-configure-ssl-version' (diff) | |
| parent | send-email: provide whitelist of SMTP AUTH mechanisms (diff) | |
| download | tgif-629ac65f68fb78a6cbff76008326ca38965e1c9a.tar.xz | |
Merge branch 'jv/send-email-selective-smtp-auth'
"git send-email" learned a new option --smtp-auth to limit the SMTP
AUTH mechanisms to be used to a subset of what the system library
supports.
* jv/send-email-selective-smtp-auth:
send-email: provide whitelist of SMTP AUTH mechanisms
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-send-email.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index f14705ee04..b9134d234f 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -171,6 +171,19 @@ Sending to determine your FQDN automatically. Default is the value of 'sendemail.smtpDomain'. +--smtp-auth=<mechanisms>:: + Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting + forces using only the listed mechanisms. Example: ++ +------ +$ 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. + --smtp-pass[=<password>]:: Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as |