]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c670b1f 649bf3a b67d40a)
Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Oct 2018 01:15:31 +0000 (10:15 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Oct 2018 01:15:46 +0000 (10:15 +0900)
commit89e4fcb0dd01b42e82b8f27f9a575111a26844df
tree35df4e9c137c145059c4f25388754684e639aba6tree | snapshot
parentc670b1f876521c9f7cd40184bf7ed05aad843433commit | diff
parent649bf3a42f344e71b1b5a7f562576f911a1f7423commit | diff
parentb67d40adbbaf4f5c4898001bf062a9fd67e43368commit | diff
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
Documentation/config.txt diff1 | diff2 | diff3 | blob | history
http.c diff1 | diff2 | diff3 | blob | history
Unnamed repository; edit this file 'description' to name the repository.