X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fgit-send-email.txt;h=631f6c8076c72947e468ad54d9cf3c1d9efa3061;hb=0f2e68b54c7f85656299539de8a4aebab795d369;hp=7ae467ba415e5cb4413d0246883b8a620b8960e3;hpb=a17c56c056d5fea0843b429132904c429a900229;p=thirdparty%2Fgit.git

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 7ae467ba41..631f6c8076 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