summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-23 18:23:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-23 18:23:23 (GMT)
commit84a37fae516eff3072a5729ce0ce40bf056fbeb1 (patch)
tree83ca6618068a165f29bbd7392c962935eac156e2 /Documentation
parent82b6e331a4f07b6e0080f7d18b4189d53190a04e (diff)
parentdcd01ea187fc9a936b4083a85343989840afd7bd (diff)
downloadgit-84a37fae516eff3072a5729ce0ce40bf056fbeb1.zip
git-84a37fae516eff3072a5729ce0ce40bf056fbeb1.tar.gz
git-84a37fae516eff3072a5729ce0ce40bf056fbeb1.tar.bz2
Merge branch 'km/imap-send-libcurl-options' into maint
"git imap-send" learned to optionally talk with an IMAP server via libcURL; because there is no other option when Git is built with NO_OPENSSL option, use that codepath by default under such configuration. * km/imap-send-libcurl-options: imap-send: use cURL automatically when NO_OPENSSL defined
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-imap-send.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 77aacf1..5d1e4c8 100644
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -44,7 +44,8 @@ OPTIONS
--no-curl::
Talk to the IMAP server using git's own IMAP routines instead of
- using libcurl.
+ using libcurl. Ignored if Git was built with the NO_OPENSSL option
+ set.
CONFIGURATION