Merge branch 'bn/http-cookiefile-config'
commit459000ef630f99c5f94c92110a5305240a9ef281
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:18 +0000 (17 14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:18 +0000 (17 14:38 -0700)
treeca8d05d8a87a2df1e04c7c3b75e49aae8662fc3c
parent6675f501f6b987dbdb0dbeb1d2efeb5a27fc41a7
parente5a39ad8e67d61f1f7dfb6ef9d9127a8b11da72c
Merge branch 'bn/http-cookiefile-config'

"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
Documentation/config.txt
http.c