]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'cb/ssl-config-pathnames' into maint
authorJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:21:01 +0000 (17:21 -0500)
committerJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:21:01 +0000 (17:21 -0500)
Allow tilde-expansion in some http config variables.

* cb/ssl-config-pathnames:
  http: treat config options sslCAPath and sslCAInfo as paths

1  2 
http.c

diff --cc http.c
Simple merge