summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Add diff progress callback.Jason Haslam2015-11-025-9/+74
|/ / / /
* | | | Merge pull request #3491 from libgit2/cmn/config-checksumEdward Thomson2015-11-024-36/+59
|\ \ \ \
| * | | | filebuf: use an internal buffercmn/config-checksumCarlos Martín Nieto2015-10-301-6/+10
| * | | | filebuf: use a checksum to detect file changesCarlos Martín Nieto2015-10-303-34/+33
| * | | | config: add failing test for an external modificationCarlos Martín Nieto2015-10-301-0/+20
* | | | | Merge pull request #3495 from leoyanggit/fix_transport_buildEdward Thomson2015-11-021-0/+1
|\ \ \ \ \
| * | | | | Fix build for custom transport usersLeo Yang2015-10-301-0/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #3492 from libgit2/vmg/redundantVicent Marti2015-11-0210-22/+202
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | merge: Fix memory leak in testvmg/redundantVicent Marti2015-11-021-0/+1
| * | | | Add test caseVicent Marti2015-11-028-0/+30
| * | | | merge-base: StyleVicent Marti2015-11-021-1/+6
| * | | | merge-base: Do not read parents from the rootVicent Marti2015-11-021-1/+1
| * | | | merge-base: Remove redundant merge basesVicent Marti2015-11-022-22/+166
|/ / / /
* | | | Merge pull request #3493 from ethomson/read_indexCarlos Martín Nieto2015-10-301-9/+29
|\ \ \ \ | |/ / / |/| | |
| * | | index: read_index must update hashesEdward Thomson2015-10-301-9/+29
* | | | git: put NULL check at the topCarlos Martín Nieto2015-10-301-2/+5
|/ / /
* | | git: accept NULL as argument to its stream freeCarlos Martín Nieto2015-10-301-2/+2
* | | Merge pull request #3486 from srajko/reflog-segfault-fixCarlos Martín Nieto2015-10-292-1/+44
|\ \ \
| * | | Prevent segfault when parsing a reflog with oid parse errorStjepan Rajko2015-10-292-1/+44
* | | | pool: fix documentationEdward Thomson2015-10-281-2/+2
* | | | Merge pull request #3488 from libgit2/vmg/poolVicent Marti2015-10-2819-354/+102
|\ \ \ \
| * | | | merge: Do not mallocz unecessary entriesvmg/poolVicent Marti2015-10-281-2/+2
| * | | | pool: update commentVicent Marti2015-10-281-1/+1
| * | | | pool: Dot not assume mallocs are zeroed outVicent Marti2015-10-284-24/+23
| * | | | pool: Handle 32 bit systemsVicent Marti2015-10-281-1/+1
| * | | | pool: Take into account malloc overhead & pool page sizeVicent Marti2015-10-281-1/+2
| * | | | repository: plug memory leakVicent Marti2015-10-281-0/+1
| * | | | pool: Simplify implementationVicent Marti2015-10-2817-336/+83
|/ / / /
* | | | Merge pull request #3489 from libgit2/vmg/reuc-insertVicent Marti2015-10-283-49/+66
|\ \ \ \
| * | | | merge: Plug memory leakvmg/reuc-insertVicent Marti2015-10-271-3/+3
| * | | | merge: Implement `GIT_MERGE_TREE_SKIP_REUC`Vicent Marti2015-10-272-28/+48
| * | | | reuc: Be smarter when inserting new REUC entriesVicent Marti2015-10-271-19/+16
|/ / / /
* | | | Merge pull request #3485 from srajko/giterr_clear-typo-fixCarlos Martín Nieto2015-10-261-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix docs typo geterr_clear -> giterr_clearStjepan Rajko2015-10-261-1/+1
|/ / /
* | | Merge pull request #3477 from linquize/inttypes.hEdward Thomson2015-10-231-1/+1
|\ \ \
| * | | inttypes.h is built-in header file since MSVC 2013Linquize2015-10-221-1/+1
* | | | Merge pull request #3483 from ethomson/cmake_xcodeCarlos Martín Nieto2015-10-231-9/+9
|\ \ \ \
| * | | | cmake: split sources into original paths for Xcode and MSVCEdward Thomson2015-10-221-9/+9
* | | | | Merge pull request #3481 from ethomson/xdiff_includeCarlos Martín Nieto2015-10-231-1/+1
|\ \ \ \ \
| * | | | | xdiff: reference util.h in parent directoryEdward Thomson2015-10-221-1/+1
* | | | | | Merge pull request #3482 from ethomson/merge_fail_on_conflictVicent Marti2015-10-235-6/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-225-6/+38
|/ / / / /
* | | | | Merge pull request #3480 from ethomson/nsecsCarlos Martín Nieto2015-10-2214-1/+96
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | diff: ignore nsecs when diffingEdward Thomson2015-10-221-1/+3
| * | | | index: test that we round-trip nsecsEdward Thomson2015-10-2213-0/+93
| |/ / /
* | | | Merge pull request #3475 from libgit2/cmn/programdata-configEdward Thomson2015-10-219-10/+123
|\ \ \ \
| * | | | config: add a ProgramData levelcmn/programdata-configCarlos Martín Nieto2015-10-219-10/+123
* | | | | Merge pull request #3479 from ethomson/cplusplusCarlos Martín Nieto2015-10-211-6/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | win32: add c linkage guard around inttypes.h inclusionEdward Thomson2015-10-211-6/+8
|/ / / /
* | | | Merge pull request #3478 from libgit2/vmg/crudVicent Marti2015-10-216-8/+30
|\ \ \ \ | |/ / / |/| | |