Merge branch 'js/checkout-detach-count' into maint

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 327233c85b4cb9af07b8866b055a83d25b21b569..324117072d55f831b07f96ca23d27be88b2abaa4 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -198,6 +198,10 @@ must be used for each option.
        if a username is not specified (with '--smtp-user' or 'sendemail.smtpuser'),
        then authentication is not attempted.
 
+--smtp-debug=0|1::
+       Enable (1) or disable (0) debug output. If enabled, SMTP
+       commands and replies will be printed. Useful to debug TLS
+       connection and authentication problems.
 
 Automating
 ~~~~~~~~~~