summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4770 from tiennou/feature/merge-analysis-any-branchPatrick Steinhardt2018-11-306-30/+131
|\
| * merge: assert that we're passed sane parametersEtienne Samson2018-10-191-2/+2
| * merge: make analysis possible against a non-HEAD referenceEtienne Samson2018-10-195-28/+127
| * repository: assert that we're passed a valid head pointerEtienne Samson2018-10-161-0/+2
* | Merge pull request #4888 from TheBB/add-cbPatrick Steinhardt2018-11-293-10/+33
|\ \
| * | revwalk: Allow changing hide_cbEivind Fonn2018-11-283-10/+33
* | | Merge pull request #4895 from pks-t/pks/unused-warningsPatrick Steinhardt2018-11-2935-308/+365
|\ \ \
| * | | cmake: enable warnings for unused const variablesPatrick Steinhardt2018-11-281-1/+1
| * | | tests: mailmap: avoid definition of unused static variablesPatrick Steinhardt2018-11-282-23/+23
| * | | khash: move khash include into implementation filesPatrick Steinhardt2018-11-288-43/+54
| * | | khash: remove intricate knowledge of khash typesPatrick Steinhardt2018-11-2822-60/+57
| * | | khash: implement map-specific foreach macrosPatrick Steinhardt2018-11-284-5/+46
| * | | khash: implement begin/end via functions instead of macrosPatrick Steinhardt2018-11-286-5/+41
| * | | submodule: remove string map implementation that strips trailing slashesPatrick Steinhardt2018-11-281-29/+0
| * | | idxmap: remove unused foreach macrosPatrick Steinhardt2018-11-281-3/+0
| * | | cmake: enable warnings for unused functionsPatrick Steinhardt2018-11-281-1/+1
| * | | iterator: remove unused function `tree_iterator_entry_cmp`Patrick Steinhardt2018-11-281-8/+0
| * | | tests: path: only compile test_canonicalize on Win32 platformsPatrick Steinhardt2018-11-281-5/+2
| * | | tests: move apply_helpers functions into own compilation unitPatrick Steinhardt2018-11-282-126/+141
* | | | Merge pull request #4870 from libgit2/ethomson/proxyEdward Thomson2018-11-2828-769/+1209
|\ \ \ \
| * | | | http: reset replay_count upon connectionethomson/proxyEdward Thomson2018-11-281-0/+1
| * | | | stream registration: take an enum typeEdward Thomson2018-11-286-27/+83
| * | | | http: don't allow SSL connections to a proxyEdward Thomson2018-11-281-1/+9
| * | | | http: only load proxy configuration during connectionEdward Thomson2018-11-281-2/+4
| * | | | stream: provide generic registration APIEdward Thomson2018-11-288-84/+262
| * | | | http: disallow repeated headers from serversEdward Thomson2018-11-281-9/+18
| * | | | CMake: disable deprecated documentation syncEdward Thomson2018-11-281-0/+1
| * | | | tests: optionally ignore https cert validationEdward Thomson2018-11-281-0/+18
| * | | | http: remove cURLEdward Thomson2018-11-2810-467/+2
| * | | | streams: remove unused tls functionsEdward Thomson2018-11-285-42/+12
| * | | | http: use CONNECT to talk to proxiesEdward Thomson2018-11-281-13/+224
| * | | | tls: introduce a wrap functionEdward Thomson2018-11-2812-96/+351
| * | | | proxy tests: rename credential callbackEdward Thomson2018-11-281-2/+2
| * | | | proxy tests: support self-signed proxy certEdward Thomson2018-11-281-0/+30
| * | | | http transport: reset error message on cert failureEdward Thomson2018-11-281-11/+11
| * | | | http transport: support cert check for proxiesEdward Thomson2018-11-281-39/+70
| * | | | http transport: provide proxy credentialsEdward Thomson2018-11-284-8/+19
| * | | | http transport: refactor storageEdward Thomson2018-11-281-120/+133
| * | | | http transport: cap number of authentication replaysEdward Thomson2018-11-283-9/+10
| * | | | http transport: prompt for proxy credentialsEdward Thomson2018-11-281-19/+37
| * | | | http transport: further refactor credential handlingEdward Thomson2018-11-281-17/+32
| * | | | http transport: refactor credential handlingEdward Thomson2018-11-281-47/+58
| * | | | http transport: use HTTP proxies when requestedEdward Thomson2018-11-281-33/+80
| * | | | http: rename http subtransport's `io` to `gitserver_stream`Edward Thomson2018-11-281-29/+38
| * | | | tests: support optional PROXY_SCHEMEEdward Thomson2018-11-281-3/+12
| * | | | tests: PROXY_URL is more accurately PROXY_HOSTEdward Thomson2018-11-283-12/+12
| * | | | http: rename `connection_data` -> `gitserver_data`Edward Thomson2018-11-281-20/+20
| * | | | proxy: propagate proxy configuration errorsEdward Thomson2018-11-281-1/+2
* | | | | Merge pull request #4898 from pks-t/pks/config-parent-is-fileEdward Thomson2018-11-282-1/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | config: fix adding files if their parent directory is a filePatrick Steinhardt2018-11-282-1/+21
| |/ / /
View Lorry Controller Status