diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:15:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:15:46 +0900 |
| commit | 89e4fcb0dd01b42e82b8f27f9a575111a26844df (patch) | |
| tree | 35df4e9c137c145059c4f25388754684e639aba6 /Documentation/config.txt | |
| parent | c670b1f876521c9f7cd40184bf7ed05aad843433 (diff) | |
| parent | 649bf3a42f344e71b1b5a7f562576f911a1f7423 (diff) | |
| parent | b67d40adbbaf4f5c4898001bf062a9fd67e43368 (diff) | |
| download | git-89e4fcb0dd01b42e82b8f27f9a575111a26844df.tar.gz | |
Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split
* bp/reset-quiet:
reset: warn when refresh_index() takes more than 2 seconds
reset: add new reset.quiet config setting
reset: don't compute unstaged changes after reset when --quiet
* js/mingw-http-ssl:
http: when using Secure Channel, ignore sslCAInfo by default
http: add support for disabling SSL revocation checks in cURL
http: add support for selecting SSL backends at runtime