diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-31 14:08:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-31 14:08:28 -0700 |
| commit | e646a82ce2828d6e8e3a18fe02dd9b3d31478f00 (patch) | |
| tree | 7c0bb9c9a082af8e09054af6c370935d0aff9f96 /Documentation | |
| parent | Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint (diff) | |
| parent | http: expand http.cookieFile as a path (diff) | |
| download | tgif-e646a82ce2828d6e8e3a18fe02dd9b3d31478f00.tar.xz | |
Merge branch 'bn/http-cookiefile-config' into maint
"http.cookieFile" configuration variable clearly wants a pathname,
but we forgot to treat it as such by e.g. applying tilde expansion.
* bn/http-cookiefile-config:
http: expand http.cookieFile as a path
Documentation: config: improve word ordering for http.cookieFile
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index d3a6de81d3..b945d67bc0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1669,11 +1669,12 @@ http.emptyAuth:: authentication. http.cookieFile:: - File containing previously stored cookie lines which should be used + The pathname of a 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 `curl(1)`). - NOTE that the file specified with http.cookieFile is only used as + NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set. http.saveCookies:: |