Merge branch 'rs/sha1-file-close-mapped-file-on-error'

diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index a56d848bc0ff87e4fed52081bd7d92952c319c68..5a32f5b0a5a9c312bb414d0405cab0f97e826a01 100644 (file)
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -68,6 +68,15 @@ http.saveCookies::
        If set, store cookies received during requests to the file specified by
        http.cookieFile. Has no effect if http.cookieFile is unset.
 
+http.version::
+       Use the specified HTTP protocol version when communicating with a server.
+       If you want to force the default. The available and default version depend
+       on libcurl. Actually the possible values of
+       this option are:
+
+       - HTTP/2
+       - HTTP/1.1
+
 http.sslVersion::
        The SSL version to use when negotiating an SSL connection, if you
        want to force the default.  The available and default version