summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase: correctly finish rebasing detached headsethomson/rebase_detachedEdward Thomson2016-04-212-24/+85
* rebase: handle detached HEADs in `init`Edward Thomson2016-04-211-3/+11
* rebase: test abort immediately after initEdward Thomson2016-04-211-5/+65
* Merge pull request #3110 from libgit2/cmn/proxy-configEdward Thomson2016-04-1930-71/+574
|\
| * CI: download the proxy jar also on mingwcmn/proxy-configCarlos Martín Nieto2016-04-191-2/+3
| * CI: run proxy tests with ctestCarlos Martín Nieto2016-04-192-2/+4
| * proxy: don't specify the protocol in the typeCarlos Martín Nieto2016-04-194-14/+9
| * CI: start the proxy before the build so it's readyCarlos Martín Nieto2016-04-192-9/+10
| * winhttp: correctly detect HTTPS usageCarlos Martín Nieto2016-04-191-2/+14
| * curl: ask for proxy credentialsCarlos Martín Nieto2016-04-191-4/+81
| * proxy: add a payload field for the proxy optionsCarlos Martín Nieto2016-04-192-0/+22
| * net: use proxy options struct in the stream configCarlos Martín Nieto2016-04-195-16/+46
| * proxy: don't require the trailing slash on WinHTTPCarlos Martín Nieto2016-04-192-3/+4
| * proxy: test proxy support on TravisCarlos Martín Nieto2016-04-191-0/+14
| * netops: make the path optional in URLsCarlos Martín Nieto2016-04-192-10/+21
| * proxy: use poxy to test our Windows proxy supportCarlos Martín Nieto2016-04-193-1/+11
| * proxy: ask the user for credentials if necessaryCarlos Martín Nieto2016-04-1917-41/+260
| * proxy: introduce a proxy options structCarlos Martín Nieto2016-04-193-0/+108
* | Merge pull request #3745 from libgit2/cmn/ignore-starstarEdward Thomson2016-04-192-5/+44
|\ \ | |/ |/|
| * ignore: move star-star matching closer to it usecmn/ignore-starstarCarlos Martín Nieto2016-04-191-16/+11
| * ignore: fix directory limits when searching for star-starCarlos Martín Nieto2016-04-192-6/+36
| * Add more tests for path matching with globs and path delimitersAntonio Scandurra2016-04-181-0/+14
|/
* Merge pull request #3740 from Qix-/patch-1Carlos Martín Nieto2016-04-131-1/+1
|\
| * Add missing ')' to callbacks documentationJosh Junon2016-04-121-1/+1
|/
* Merge pull request #3738 from ethomson/test_as_rootCarlos Martín Nieto2016-04-122-0/+8
|\
| * tests: skip the unreadable file tests as rootEdward Thomson2016-04-112-0/+8
|/
* Merge pull request #3736 from libgit2/cmn/dwim-general-messageEdward Thomson2016-04-112-0/+11
|\
| * refs: provide a more general error message for dwimcmn/dwim-general-messageCarlos Martín Nieto2016-04-112-0/+11
* | Merge pull request #3737 from ethomson/strict-objectCarlos Martín Nieto2016-04-112-8/+8
|\ \ | |/ |/|
| * refs::create: strict object creation on by defaultEdward Thomson2016-04-111-5/+5
| * reset: use real ids for the testsCarlos Martín Nieto2016-04-111-3/+3
|/
* Merge pull request #3730 from andhe/fix-stream-testEdward Thomson2016-04-061-2/+6
|\
| * tests: fix core/stream test when built with openssl offAndreas Henriksson2016-04-061-2/+6
|/
* Merge pull request #3728 from libgit2/cmn/no-embedEdward Thomson2016-04-051-60/+0
|\
| * Remove Makefile.embedcmn/no-embedCarlos Martín Nieto2016-04-051-60/+0
|/
* Merge pull request #3724 from ethomson/submodule_start_supports_silly_slashesCarlos Martín Nieto2016-04-023-16/+85
|\
| * iterator: support trailing `/` in start for submodEdward Thomson2016-04-022-16/+38
| * diff: test submodules are found with trailing `/`Edward Thomson2016-04-021-0/+47
* | Merge pull request #3723 from libgit2/cmn/ignore-symlinkEdward Thomson2016-04-022-3/+24
|\ \ | |/ |/|
| * ignore: don't use realpath to canonicalize pathcmn/ignore-symlinkCarlos Martín Nieto2016-04-022-3/+24
|/
* Merge pull request #3720 from pks-t/pks/merge-driver-memleaksCarlos Martín Nieto2016-04-011-0/+1
|\
| * merge_driver: fix missing `goto done;`Patrick Steinhardt2016-04-011-0/+1
* | Merge pull request #3719 from libgit2/ethomson/submodule_statusCarlos Martín Nieto2016-04-01231-1/+423
|\ \ | |/ |/|
| * iterator: use correct search functionethomson/submodule_statusEdward Thomson2016-03-311-1/+1
| * status: test submodules with mixed caseEdward Thomson2016-03-31230-0/+422
* | Merge pull request #3717 from libgit2/ethomson/leaksCarlos Martín Nieto2016-03-319-9/+60
|\ \ | |/ |/|
| * leaks: call `xdl_free_classifier`Edward Thomson2016-03-311-1/+1
| * leaks: fix some leaks in the testsEdward Thomson2016-03-315-2/+19
| * leaks: fix some iterator leaksEdward Thomson2016-03-311-6/+22
| * Plug a few leaksCarlos Martín Nieto2016-03-313-0/+18
|/