summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* annotated_commit: provide refs and descriptionethomson/annotated_commit_refsEdward Thomson2016-04-265-85/+108
* rebase::abort: test we can abort rebase by revspecEdward Thomson2016-04-261-0/+19
* Merge pull request #3755 from arthurschreiber/patch-9Carlos Martín Nieto2016-04-261-41/+0
|\
| * Remove traces of `git_blob_create_fromchunks`Arthur Schreiber2016-04-261-41/+0
|/
* Merge pull request #3749 from arthurschreiber/arthur/add-git-reference-dupCarlos Martín Nieto2016-04-263-1/+64
|\
| * Allow creating copies of `git_reference` objects.Arthur Schreiber2016-04-223-1/+64
* | Merge pull request #3748 from libgit2/ethomson/rebase_detachedCarlos Martín Nieto2016-04-263-32/+161
|\ \
| * | 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 #3752 from libgit2/cmn/silly-tagsEdward Thomson2016-04-252-2/+45
|\ \
| * | tag: ignore extra header fieldscmn/silly-tagsCarlos Martín Nieto2016-04-252-2/+45
|/ /
* | Merge pull request #3747 from libgit2/ethomson/warningsCarlos Martín Nieto2016-04-224-8/+11
|\ \ | |/ |/|
| * clone test: annotate unused varsEdward Thomson2016-04-211-1/+3
| * transport: cast away constness for freeEdward Thomson2016-04-211-1/+1
| * stransport: pass proxy opts instead of char*Edward Thomson2016-04-211-2/+4
| * iterator: ignore submodule in has_endedEdward Thomson2016-04-211-4/+3
|/
* 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
|\