Merge branch 'maint'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 65dc587f7cbf0f913b79915ba70123fd7189d4f7..9f40955f8e74a0263019eb228a548ffd2b1fd301 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1136,6 +1136,12 @@ http.maxRequests::
        How many HTTP requests to launch in parallel. Can be overridden
        by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
 
+http.minSessions::
+       The number of curl sessions (counted across slots) to be kept across
+       requests. They will not be ended with curl_easy_cleanup() until
+       http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this
+       value will be capped at 1. Defaults to 1.
+
 http.postBuffer::
        Maximum size in bytes of the buffer used by smart HTTP
        transports when POSTing data to the remote system.