summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-06-29 17:03:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-06-29 17:03:12 -0700
commit187e902dd25da5a9f48f35a48e6281faa2f8ac39 (patch)
tree116dd729b9883c9de4100c1e6beabdd90cc05cab /Documentation
parentMerge branch 'jk/maint-1.7.2-status-ignored' (diff)
parenthttp: pass http.cookiefile using CURLOPT_COOKIEFILE (diff)
downloadtgif-187e902dd25da5a9f48f35a48e6281faa2f8ac39.tar.xz
Merge branch 'db/http-cookies'
* db/http-cookies: http: pass http.cookiefile using CURLOPT_COOKIEFILE
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6b93777199..c631d1cbf9 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1196,6 +1196,14 @@ http.proxy::
environment variable (see linkgit:curl[1]). This can be overridden
on a per-remote basis; see remote.<name>.proxy
+http.cookiefile::
+ File containing previously stored cookie lines which should be used
+ in the git http session, if they match the server. The file format
+ of the file to read cookies from should be plain HTTP headers or
+ the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
+ NOTE that the file specified with http.cookiefile is only used as
+ input. No cookies will be stored in the file.
+
http.sslVerify::
Whether to verify the SSL certificate when fetching or pushing
over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment