Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | array: fix search for empty arrays | Carlos Martín Nieto | 2016-03-23 | 1 | -1/+1 | |
* | | | Merge pull request #3704 from ethomson/tree-reuse | Carlos Martín Nieto | 2016-03-23 | 4 | -46/+125 | |
|\ \ \ | ||||||
| * | | | tree: drop the now-unnecessary entries vector | Edward Thomson | 2016-03-22 | 4 | -46/+125 | |
* | | | | Merge pull request #3502 from libgit2/cmn/createblob-stream | Carlos Martín Nieto | 2016-03-22 | 7 | -196/+233 | |
|\ \ \ \ | ||||||
| * | | | | blob: remove _fromchunks()cmn/createblob-stream | Carlos Martín Nieto | 2016-03-22 | 3 | -216/+4 | |
| * | | | | CHANGELOG: add a note about _fromstream() and _fromstream_commit() | Carlos Martín Nieto | 2016-03-22 | 1 | -0/+5 | |
| * | | | | blob: fix fromchunks iteration counter | Carlos Martín Nieto | 2016-03-22 | 2 | -6/+6 | |
| * | | | | blob: introduce creating a blob by writing into a stream | Carlos Martín Nieto | 2016-03-22 | 3 | -0/+238 | |
| * | | | | filebuf: allow using a custom buffer size | Carlos Martín Nieto | 2016-03-22 | 2 | -1/+7 | |
|/ / / / | ||||||
* | | | | Merge pull request #3559 from yongthecoder/master | Carlos Martín Nieto | 2016-03-22 | 1 | -2/+7 | |
|\ \ \ \ | ||||||
| * | | | | Avoid subtraction overflow in git_indexer_commit | Yong Li | 2016-01-04 | 1 | -2/+7 | |
* | | | | | Merge pull request #3701 from jfultz/fix-0.24.0-changelog | Carlos Martín Nieto | 2016-03-22 | 1 | -1/+4 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Fix some errors I found in the changelog for 0.24.0 | John Fultz | 2016-03-18 | 1 | -1/+4 | |
* | | | | | Merge pull request #3702 from libgit2/cmn/tree-reuse | Edward Thomson | 2016-03-21 | 8 | -83/+76 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | tree: store the entries in a growable arraycmn/tree-reuse | Carlos Martín Nieto | 2016-03-20 | 2 | -60/+38 | |
| * | | | | tree: re-use the id and filename in the odb object | Carlos Martín Nieto | 2016-03-20 | 8 | -52/+67 | |
|/ / / / | ||||||
* | | | | Merge pull request #3699 from libgit2/cmn/win32-free-tls | Edward Thomson | 2016-03-18 | 1 | -0/+14 | |
|\ \ \ \ | ||||||
| * | | | | win32: free thread-local data on thread exitcmn/win32-free-tls | Carlos Martin Nieto | 2016-03-18 | 1 | -0/+14 | |
* | | | | | Merge pull request #3660 from mstrap/mingw | Edward Thomson | 2016-03-18 | 1 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Option "LIBGIT2_PREFIX" to set the CMAKE's TARGET_PROPERTIES PREFIX | Marc Strapetz | 2016-03-15 | 1 | -0/+2 | |
* | | | | | | Merge pull request #3564 from ethomson/merge_drivers | Carlos Martín Nieto | 2016-03-17 | 11 | -115/+1309 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | merge drivers: handle configured but not found driver | Edward Thomson | 2016-03-17 | 2 | -4/+31 | |
| * | | | | | | merge driver: remove `check` callback | Edward Thomson | 2016-03-17 | 6 | -306/+81 | |
| * | | | | | | merge driver: improve inline documentation | Edward Thomson | 2016-03-17 | 1 | -18/+21 | |
| * | | | | | | merge driver: correct global initialization | Edward Thomson | 2016-03-17 | 5 | -94/+160 | |
| * | | | | | | merge driver: get a pointer to favor | Edward Thomson | 2016-03-17 | 2 | -4/+9 | |
| * | | | | | | merge driver: correct indentation | Edward Thomson | 2016-03-17 | 2 | -30/+30 | |
| * | | | | | | merge driver: tests for set and unset merge attribute | Edward Thomson | 2016-03-17 | 1 | -1/+36 | |
| * | | | | | | merge driver: tests for custom default merge drivers | Edward Thomson | 2016-03-17 | 1 | -0/+59 | |
| * | | | | | | merge driver: allow custom default driver | Edward Thomson | 2016-03-17 | 5 | -43/+88 | |
| * | | | | | | merge driver: test GIT_EMERGECONFLICT | Edward Thomson | 2016-03-17 | 1 | -0/+90 | |
| * | | | | | | merge driver: test GIT_PASSTHROUGH | Edward Thomson | 2016-03-17 | 1 | -0/+95 | |
| * | | | | | | merge driver: introduce custom merge drivers | Edward Thomson | 2016-03-17 | 6 | -129/+1061 | |
| * | | | | | | Fix rebase bug and include test for merge=union | Stan Hu | 2016-03-17 | 2 | -1/+37 | |
| * | | | | | | Support union merges via .gitattributes file | Stan Hu | 2016-03-17 | 1 | -0/+26 | |
* | | | | | | | Merge pull request #3695 from ethomson/contributing | Carlos Martín Nieto | 2016-03-17 | 1 | -1/+16 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | CONTRIBUTING: document the optional tests | Edward Thomson | 2016-03-17 | 1 | -1/+16 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3673 from libgit2/cmn/commit-with-signature | Edward Thomson | 2016-03-17 | 3 | -0/+185 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | commit: add function to attach a signature to a commitcmn/commit-with-signature | Carlos Martín Nieto | 2016-03-15 | 3 | -0/+185 | |
* | | | | | | | Merge pull request #3685 from pks-t/pks/memleaks | Edward Thomson | 2016-03-17 | 2 | -20/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | tests: transport: fix memory leaks with registering transports | Patrick Steinhardt | 2016-03-11 | 1 | -18/+17 | |
| * | | | | | | | tests: nsec: correctly free nsec_path | Patrick Steinhardt | 2016-03-11 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #3687 from mstrap/CMAKE_C_FLAGS_DEBUG | Edward Thomson | 2016-03-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | CMake: do not overwrite but only append to CMAKE_C_FLAGS_DEBUG | Marc Strapetz | 2016-03-15 | 1 | -2/+2 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #3693 from libgit2/cmn/extract-oneline-sig | Edward Thomson | 2016-03-17 | 2 | -1/+25 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | commit: fix extraction of single-line signaturescmn/extract-oneline-sig | Carlos Martín Nieto | 2016-03-17 | 2 | -1/+25 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3690 from libgit2/cmn/pool-limit | Edward Thomson | 2016-03-16 | 5 | -9/+41 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Split the page size from the mmap alignmentcmn/pool-limit | Carlos Martín Nieto | 2016-03-16 | 5 | -9/+41 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3677 from pks-t/pks/coverity-fixes-round7 | Carlos Martín Nieto | 2016-03-14 | 6 | -14/+39 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | config_cache: check return value of `git_config__lookup_entry` | Patrick Steinhardt | 2016-03-11 | 1 | -1/+2 |