summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config: don't special-case multivars that don't exist yetcmn/multivar-set-lockedCarlos Martín Nieto2016-03-212-18/+1
* Merge pull request #3699 from libgit2/cmn/win32-free-tlsEdward Thomson2016-03-181-0/+14
|\
| * win32: free thread-local data on thread exitcmn/win32-free-tlsCarlos Martin Nieto2016-03-181-0/+14
* | Merge pull request #3660 from mstrap/mingwEdward Thomson2016-03-181-0/+2
|\ \
| * | Option "LIBGIT2_PREFIX" to set the CMAKE's TARGET_PROPERTIES PREFIXMarc Strapetz2016-03-151-0/+2
* | | Merge pull request #3564 from ethomson/merge_driversCarlos Martín Nieto2016-03-1711-115/+1309
|\ \ \
| * | | merge drivers: handle configured but not found driverEdward Thomson2016-03-172-4/+31
| * | | merge driver: remove `check` callbackEdward Thomson2016-03-176-306/+81
| * | | merge driver: improve inline documentationEdward Thomson2016-03-171-18/+21
| * | | merge driver: correct global initializationEdward Thomson2016-03-175-94/+160
| * | | merge driver: get a pointer to favorEdward Thomson2016-03-172-4/+9
| * | | merge driver: correct indentationEdward Thomson2016-03-172-30/+30
| * | | merge driver: tests for set and unset merge attributeEdward Thomson2016-03-171-1/+36
| * | | merge driver: tests for custom default merge driversEdward Thomson2016-03-171-0/+59
| * | | merge driver: allow custom default driverEdward Thomson2016-03-175-43/+88
| * | | merge driver: test GIT_EMERGECONFLICTEdward Thomson2016-03-171-0/+90
| * | | merge driver: test GIT_PASSTHROUGHEdward Thomson2016-03-171-0/+95
| * | | merge driver: introduce custom merge driversEdward Thomson2016-03-176-129/+1061
| * | | Fix rebase bug and include test for merge=unionStan Hu2016-03-172-1/+37
| * | | Support union merges via .gitattributes fileStan Hu2016-03-171-0/+26
* | | | Merge pull request #3695 from ethomson/contributingCarlos Martín Nieto2016-03-171-1/+16
|\ \ \ \ | |/ / / |/| | |
| * | | CONTRIBUTING: document the optional testsEdward Thomson2016-03-171-1/+16
|/ / /
* | | Merge pull request #3673 from libgit2/cmn/commit-with-signatureEdward Thomson2016-03-173-0/+185
|\ \ \
| * | | commit: add function to attach a signature to a commitcmn/commit-with-signatureCarlos Martín Nieto2016-03-153-0/+185
* | | | Merge pull request #3685 from pks-t/pks/memleaksEdward Thomson2016-03-172-20/+19
|\ \ \ \
| * | | | tests: transport: fix memory leaks with registering transportsPatrick Steinhardt2016-03-111-18/+17
| * | | | tests: nsec: correctly free nsec_pathPatrick Steinhardt2016-03-111-2/+2
| |/ / /
* | | | Merge pull request #3687 from mstrap/CMAKE_C_FLAGS_DEBUGEdward Thomson2016-03-171-2/+2
|\ \ \ \
| * | | | CMake: do not overwrite but only append to CMAKE_C_FLAGS_DEBUGMarc Strapetz2016-03-151-2/+2
| | |/ / | |/| |
* | | | Merge pull request #3693 from libgit2/cmn/extract-oneline-sigEdward Thomson2016-03-172-1/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | commit: fix extraction of single-line signaturescmn/extract-oneline-sigCarlos Martín Nieto2016-03-172-1/+25
|/ / /
* | | Merge pull request #3690 from libgit2/cmn/pool-limitEdward Thomson2016-03-165-9/+41
|\ \ \
| * | | Split the page size from the mmap alignmentcmn/pool-limitCarlos Martín Nieto2016-03-165-9/+41
|/ / /
* | | Merge pull request #3677 from pks-t/pks/coverity-fixes-round7Carlos Martín Nieto2016-03-146-14/+39
|\ \ \
| * | | config_cache: check return value of `git_config__lookup_entry`Patrick Steinhardt2016-03-111-1/+2
| * | | filebuf: handle write error in `lock_file`Patrick Steinhardt2016-03-111-1/+6
| * | | config_file: handle error when trying to lock strmapPatrick Steinhardt2016-03-111-8/+20
| * | | blame: handle error when resoling HEAD in normalize_optionsPatrick Steinhardt2016-03-111-3/+8
| * | | blame_git: handle error returned by `git_commit_parent`Patrick Steinhardt2016-03-111-1/+2
| * | | refdb_fs: fail if refcache returns NULL pointerPatrick Steinhardt2016-03-111-0/+1
| | |/ | |/|
* | | Merge pull request #3647 from pks-t/pks/coverity-fixes-round6Carlos Martín Nieto2016-03-148-17/+45
|\ \ \
| * | | coverity: report errors when uploading tarballPatrick Steinhardt2016-03-111-2/+16
| * | | diff_tform: fix potential NULL pointer accessPatrick Steinhardt2016-03-111-3/+5
| * | | submodule: avoid passing NULL pointers to strncmpPatrick Steinhardt2016-03-111-1/+2
| * | | pack-objects: fix memory leak on overflowPatrick Steinhardt2016-03-111-1/+3
| * | | index: assert required OID are non-NULLPatrick Steinhardt2016-03-111-3/+9
| * | | object: avoid call of memset with ouf of bounds pointerPatrick Steinhardt2016-03-111-6/+3
| * | | config_file: handle missing quotation marks in section headerPatrick Steinhardt2016-03-101-0/+5
| * | | describe: handle error code returned by git_pqueue_insertPatrick Steinhardt2016-03-101-1/+2
| |/ /
* | | Merge pull request #3671 from libgit2/cmn/remove-mingw32Edward Thomson2016-03-144-25/+1
|\ \ \
View Lorry Controller Status