summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/ |/|
| * tests: Fix warningsvmg/crudVicent Marti2015-10-212-2/+3
| * index: Remove unneeded constsVicent Marti2015-10-211-3/+3
| * signature: Strip crud just like Git doesVicent Marti2015-10-213-3/+24
|/
* Merge pull request #3466 from libgit2/cmn/quick-parse-64Edward Thomson2015-10-153-4/+39
|\
| * revwalk: make commit list use 64 bits for timecmn/quick-parse-64Carlos Martín Nieto2015-10-143-4/+39
* | Merge pull request #3444 from ethomson/add_preserves_conflict_modeCarlos Martín Nieto2015-10-153-22/+171
|\ \
| * | index: also try conflict mode when insertingEdward Thomson2015-09-303-23/+149
| * | index: test that add_bypath preserves modeEdward Thomson2015-09-291-0/+23
* | | Merge pull request #3468 from libgit2/vmg/odb-lookupsVicent Marti2015-10-153-166/+175
|\ \ \
| * | | odb: Prioritize alternate backendsvmg/odb-lookupsVicent Marti2015-10-142-12/+16
| * | | odb: Be smarter when refreshing backendsVicent Marti2015-10-142-154/+159
|/ / /
* | | Merge pull request #3453 from libgit2/cmn/warn-pythonEdward Thomson2015-10-141-1/+6
|\ \ \ | |_|/ |/| |
| * | CMake: be more explicit with python errorscmn/warn-pythonCarlos Martín Nieto2015-10-061-1/+6
* | | Merge pull request #3455 from Eun/masterCarlos Martín Nieto2015-10-071-0/+1
|\ \ \
| * | | fix returnEun2015-10-071-0/+1
|/ / /
* | | Merge pull request #3451 from ethomson/xdiffEdward Thomson2015-10-0616-155/+335
|\ \ \
| * | | blame: guard xdiff calls for large filesEdward Thomson2015-10-053-9/+29
| * | | diff: don't feed large files to xdiffEdward Thomson2015-10-058-20/+23
| * | | merge_file: treat large files as binaryEdward Thomson2015-10-055-82/+170
| * | | xdiff: convert size variables to size_tEdward Thomson2015-10-053-50/+110
| * | | GITERR_CHECK_ALLOC_ADDn: multi-arg addersEdward Thomson2015-10-051-0/+9
|/ / /
* | | Merge pull request #3447 from arthurschreiber/arthur/fix-odb-refdb-freeCarlos Martín Nieto2015-10-015-10/+10
|\ \ \
| * | | refdb and odb backends must provide `free` functionArthur Schreiber2015-10-015-10/+10
|/ / /
* | | Merge pull request #3446 from ethomson/portabilityCarlos Martín Nieto2015-09-303-14/+38
|\ \ \
| * | | qsort_r/qsort_s: detect their supportEdward Thomson2015-09-302-18/+23
| * | | p_futimes: support using futimens when availableEdward Thomson2015-09-302-1/+20
* | | | Merge pull request #3445 from libgit2/cmn/ssl-nullEdward Thomson2015-09-301-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | openssl: don't try to teardown an unconnected SSL contextcmn/ssl-nullCarlos Martín Nieto2015-09-301-1/+6
|/ / /
* | | Merge pull request #3411 from spraints/custom-push-headersCarlos Martín Nieto2015-09-3016-26/+197
|\ \ \
View Lorry Controller Status