summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-07 20:58:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-07 20:58:05 (GMT)
commitc5cb52fd7cfc4ecf43afda721d0a3700274a8361 (patch)
treec360983aec636a38d45ee489b085b5a3902667ef /Documentation
parent08db3b6392e4d878afddd23af709662653df07b4 (diff)
parent1e16b255b95b45374db0b0cf69ef0ecce768ac27 (diff)
downloadgit-c5cb52fd7cfc4ecf43afda721d0a3700274a8361.zip
git-c5cb52fd7cfc4ecf43afda721d0a3700274a8361.tar.gz
git-c5cb52fd7cfc4ecf43afda721d0a3700274a8361.tar.bz2
Merge branch 'br/imap-send-via-libcurl'
Newer libCurl knows how to talk IMAP; "git imap-send" has been updated to use this instead of a hand-rolled OpenSSL calls. * br/imap-send-via-libcurl: git-imap-send: use libcurl for implementation
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-imap-send.txt15
1 files changed, 13 insertions, 2 deletions
diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 0897131..77aacf1 100644
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -9,7 +9,7 @@ git-imap-send - Send a collection of patches from stdin to an IMAP folder
SYNOPSIS
--------
[verse]
-'git imap-send' [-v] [-q]
+'git imap-send' [-v] [-q] [--[no-]curl]
DESCRIPTION
@@ -37,6 +37,15 @@ OPTIONS
--quiet::
Be quiet.
+--curl::
+ Use libcurl to communicate with the IMAP server, unless tunneling
+ into it. Ignored if Git was built without the USE_CURL_FOR_IMAP_SEND
+ option set.
+
+--no-curl::
+ Talk to the IMAP server using git's own IMAP routines instead of
+ using libcurl.
+
CONFIGURATION
-------------
@@ -87,7 +96,9 @@ imap.preformattedHTML::
imap.authMethod::
Specify authenticate method for authentication with IMAP server.
- Current supported method is 'CRAM-MD5' only. If this is not set
+ If Git was built with the NO_CURL option, or if your curl version is older
+ than 7.34.0, or if you're running git-imap-send with the `--no-curl`
+ option, the only supported method is 'CRAM-MD5'. If this is not set
then 'git imap-send' uses the basic IMAP plaintext LOGIN command.
Examples