Merge branch 'bn/http-cookiefile-config' into maint
commite646a82ce2828d6e8e3a18fe02dd9b3d31478f00
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2016 21:08:28 +0000 (31 14:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2016 21:08:28 +0000 (31 14:08 -0700)
tree7c0bb9c9a082af8e09054af6c370935d0aff9f96
parent68a6e976a821ebf2b3766efb167fa716cbf8c188
parente5a39ad8e67d61f1f7dfb6ef9d9127a8b11da72c
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
Documentation/config.txt
http.c