summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Introduce a function to create a tree based on a different onecmn/tree-updateCarlos Martín Nieto2016-05-173-0/+458
* Merge pull request #3767 from pks-t/pks/misc-fixesEdward Thomson2016-05-096-23/+21
|\
| * diff: simplify code for handling empty dirsPatrick Steinhardt2016-05-031-10/+6
| * delta-apply: fix sign extensionPatrick Steinhardt2016-05-021-5/+5
| * odb_loose: fix undefined behavior when computing sizePatrick Steinhardt2016-05-021-1/+1
| * checkout: set ignorecase=0 when config lookup failsPatrick Steinhardt2016-05-021-2/+4
| * merge_file: do not unnecessarily check ours/theirs for NULLPatrick Steinhardt2016-05-021-4/+4
| * index: fix memory leak on error casePatrick Steinhardt2016-05-021-1/+1
* | Merge pull request #3773 from lucasderraugh/patch-1Edward Thomson2016-05-081-0/+1
|\ \
| * | Fix unused variable 'message' warningLucas Derraugh2016-05-051-0/+1
* | | Merge pull request #3757 from johnhaley81/jh/fix-create-initial-commitCarlos Martín Nieto2016-05-062-1/+61
|\ \ \ | |/ / |/| |
| * | Fix initial commit testJohn Haley2016-05-041-30/+5
| * | Add tests for creating an initial commitJohn Haley2016-05-031-0/+85
| * | Fix `git_commit_create` for an initial commitJohn Haley2016-05-031-1/+1
* | | Merge pull request #3769 from libgit2/ethomson/rebase_inmemory_no_baseCarlos Martín Nieto2016-05-043-9/+119
|\ \ \ | |/ / |/| |
| * | rebase: handle no common ancestor for inmemoryethomson/rebase_inmemory_no_baseEdward Thomson2016-05-031-4/+15
| * | rebase: test rebase (merge) w/ no common ancestorEdward Thomson2016-05-032-5/+104
|/ /
* | Merge pull request #3759 from libgit2/cmn/faster-headerEdward Thomson2016-05-023-6/+48
|\ \ | |/ |/|
| * odb: avoid inflating the full delta to read the headercmn/faster-headerCarlos Martín Nieto2016-05-023-6/+48
* | Merge pull request #3764 from libgit2/ethomson/cmake_pcCarlos Martín Nieto2016-04-291-0/+2
|\ \
| * | cmake: include threading libraries in pkg-configethomson/cmake_pcEdward Thomson2016-04-291-0/+2
|/ /
* | Merge pull request #3763 from libgit2/ethomson/signature_from_bufferCarlos Martín Nieto2016-04-293-1/+52
|\ \
| * | Introduce `git_signature_from_buffer`ethomson/signature_from_bufferEdward Thomson2016-04-283-1/+52
| |/
* | Merge pull request #3760 from backhub/bug/openssl_readEdward Thomson2016-04-281-1/+1
|\ \ | |/ |/|
| * Fix style: no bracesChristian Schlack2016-04-271-2/+1
| * Fix return value of openssl_read (infinite loop)Christian Schlack2016-04-261-2/+3
* | Merge pull request #3758 from libgit2/ethomson/annotated_commit_refsCarlos Martín Nieto2016-04-266-85/+127
|\ \ | |/ |/|
| * 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