diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:33:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:33:43 -0700 |
| commit | 72140a73198b2fdbf6fc83ff679d3f553ed5faed (patch) | |
| tree | 7ba00a7d4b59ad00610ef496d599e08568d4b452 /builtin/merge-file.c | |
| parent | Merge branch 'jk/ref-filter-colors' into maint (diff) | |
| parent | http.c: http.sslcert and http.sslkey are both pathnames (diff) | |
| download | tgif-72140a73198b2fdbf6fc83ff679d3f553ed5faed.tar.xz | |
Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maint
The http.{sslkey,sslCert} configuration variables are to be
interpreted as a pathname that honors "~[username]/" prefix, but
weren't, which has been fixed.
* jc/http-sslkey-and-ssl-cert-are-paths:
http.c: http.sslcert and http.sslkey are both pathnames
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions