From 06ea368bb160af9684a3484c78fddc5af16476ef Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 4 May 2016 11:42:14 -0700 Subject: Documentation: config: improve word ordering for http.cookieFile Signed-off-by: Brian Norris Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index fec0dea5d0..c0d7bcff8c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1602,7 +1602,7 @@ http.cookieFile:: 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 + NOTE that the file specified with http.cookieFile is used only as input unless http.saveCookies is set. http.saveCookies:: -- cgit v1.2.3 From e5a39ad8e67d61f1f7dfb6ef9d9127a8b11da72c Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 4 May 2016 11:42:15 -0700 Subject: http: expand http.cookieFile as a path This should handle .gitconfig files that specify things like: [http] cookieFile = "~/.gitcookies" Signed-off-by: Brian Norris Signed-off-by: Junio C Hamano --- Documentation/config.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index c0d7bcff8c..3c0c48478e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1598,7 +1598,8 @@ http.proxy:: remote..proxy 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 linkgit:curl[1]). -- cgit v1.2.3