Merge branch 'bw/trace-no-inline-getnanotime'

diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index eabcaf0388b354baa9e321050122d3c75caf6809..7d991d919ccf3378fdc924418aede45f8cb38632 100644 (file)
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -75,7 +75,8 @@ imap.preformattedHTML::
 
 imap.authMethod::
        Specify authenticate method for authentication with IMAP server.
-       Current supported method is 'CRAM-MD5' only.
+       Current supported method is 'CRAM-MD5' only. If this is not set
+       then 'git imap-send' uses the basic IMAP plaintext LOGIN command.
 
 Examples
 ~~~~~~~~