summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* stream: allow registering a user-provided TLS constructorcmn/tls-registerCarlos Martín Nieto2015-11-031-0/+13
* stream: accept NULL in the free functionCarlos Martín Nieto2015-11-031-0/+3
* Add diff progress callback.Jason Haslam2015-11-021-2/+13
* Merge pull request #3491 from libgit2/cmn/config-checksumEdward Thomson2015-11-023-36/+39
|\
| * 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
* | 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-291-1/+1
|\
| * Prevent segfault when parsing a reflog with oid parse errorStjepan Rajko2015-10-291-1/+1
* | pool: fix documentationEdward Thomson2015-10-281-2/+2
* | 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: 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-2816-265/+72
* | merge: Plug memory leakvmg/reuc-insertVicent Marti2015-10-271-3/+3
* | merge: Implement `GIT_MERGE_TREE_SKIP_REUC`Vicent Marti2015-10-271-28/+43
* | reuc: Be smarter when inserting new REUC entriesVicent Marti2015-10-271-19/+16
|/
* 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: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-221-1/+8
* | Merge pull request #3480 from ethomson/nsecsCarlos Martín Nieto2015-10-221-1/+3
|\ \
| * | diff: ignore nsecs when diffingEdward Thomson2015-10-221-1/+3
| |/
* | Merge pull request #3475 from libgit2/cmn/programdata-configEdward Thomson2015-10-217-5/+64
|\ \ | |/ |/|
| * config: add a ProgramData levelcmn/programdata-configCarlos Martín Nieto2015-10-217-5/+64
* | index: Remove unneeded constsVicent Marti2015-10-211-3/+3
* | signature: Strip crud just like Git doesVicent Marti2015-10-211-2/+16
|/
* Merge pull request #3466 from libgit2/cmn/quick-parse-64Edward Thomson2015-10-152-4/+4
|\
| * revwalk: make commit list use 64 bits for timecmn/quick-parse-64Carlos Martín Nieto2015-10-142-4/+4
* | Merge pull request #3444 from ethomson/add_preserves_conflict_modeCarlos Martín Nieto2015-10-151-15/+62
|\ \
| * | index: also try conflict mode when insertingEdward Thomson2015-09-301-15/+62
* | | odb: Prioritize alternate backendsvmg/odb-lookupsVicent Marti2015-10-141-4/+8
* | | odb: Be smarter when refreshing backendsVicent Marti2015-10-142-154/+159
| |/ |/|
* | blame: guard xdiff calls for large filesEdward Thomson2015-10-053-9/+29
* | diff: don't feed large files to xdiffEdward Thomson2015-10-057-17/+20
* | merge_file: treat large files as binaryEdward Thomson2015-10-054-82/+82
* | xdiff: convert size variables to size_tEdward Thomson2015-10-053-50/+110
* | GITERR_CHECK_ALLOC_ADDn: multi-arg addersEdward Thomson2015-10-051-0/+9
* | refdb and odb backends must provide `free` functionArthur Schreiber2015-10-012-8/+3
* | Merge pull request #3446 from ethomson/portabilityCarlos Martín Nieto2015-09-302-14/+22
|\ \
| * | qsort_r/qsort_s: detect their supportEdward Thomson2015-09-301-13/+8
| * | p_futimes: support using futimens when availableEdward Thomson2015-09-301-1/+14
* | | openssl: don't try to teardown an unconnected SSL contextcmn/ssl-nullCarlos Martín Nieto2015-09-301-1/+6