Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Add diff progress callback. | Jason Haslam | 2015-11-02 | 5 | -9/+74 | |
|/ / / / | ||||||
* | | | | Merge pull request #3491 from libgit2/cmn/config-checksum | Edward Thomson | 2015-11-02 | 4 | -36/+59 | |
|\ \ \ \ | ||||||
| * | | | | filebuf: use an internal buffercmn/config-checksum | Carlos Martín Nieto | 2015-10-30 | 1 | -6/+10 | |
| * | | | | filebuf: use a checksum to detect file changes | Carlos Martín Nieto | 2015-10-30 | 3 | -34/+33 | |
| * | | | | config: add failing test for an external modification | Carlos Martín Nieto | 2015-10-30 | 1 | -0/+20 | |
* | | | | | Merge pull request #3495 from leoyanggit/fix_transport_build | Edward Thomson | 2015-11-02 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix build for custom transport users | Leo Yang | 2015-10-30 | 1 | -0/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #3492 from libgit2/vmg/redundant | Vicent Marti | 2015-11-02 | 10 | -22/+202 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | merge: Fix memory leak in testvmg/redundant | Vicent Marti | 2015-11-02 | 1 | -0/+1 | |
| * | | | | Add test case | Vicent Marti | 2015-11-02 | 8 | -0/+30 | |
| * | | | | merge-base: Style | Vicent Marti | 2015-11-02 | 1 | -1/+6 | |
| * | | | | merge-base: Do not read parents from the root | Vicent Marti | 2015-11-02 | 1 | -1/+1 | |
| * | | | | merge-base: Remove redundant merge bases | Vicent Marti | 2015-11-02 | 2 | -22/+166 | |
|/ / / / | ||||||
* | | | | Merge pull request #3493 from ethomson/read_index | Carlos Martín Nieto | 2015-10-30 | 1 | -9/+29 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | index: read_index must update hashes | Edward Thomson | 2015-10-30 | 1 | -9/+29 | |
* | | | | git: put NULL check at the top | Carlos Martín Nieto | 2015-10-30 | 1 | -2/+5 | |
|/ / / | ||||||
* | | | git: accept NULL as argument to its stream free | Carlos Martín Nieto | 2015-10-30 | 1 | -2/+2 | |
* | | | Merge pull request #3486 from srajko/reflog-segfault-fix | Carlos Martín Nieto | 2015-10-29 | 2 | -1/+44 | |
|\ \ \ | ||||||
| * | | | Prevent segfault when parsing a reflog with oid parse error | Stjepan Rajko | 2015-10-29 | 2 | -1/+44 | |
* | | | | pool: fix documentation | Edward Thomson | 2015-10-28 | 1 | -2/+2 | |
* | | | | Merge pull request #3488 from libgit2/vmg/pool | Vicent Marti | 2015-10-28 | 19 | -354/+102 | |
|\ \ \ \ | ||||||
| * | | | | merge: Do not mallocz unecessary entriesvmg/pool | Vicent Marti | 2015-10-28 | 1 | -2/+2 | |
| * | | | | pool: update comment | Vicent Marti | 2015-10-28 | 1 | -1/+1 | |
| * | | | | pool: Dot not assume mallocs are zeroed out | Vicent Marti | 2015-10-28 | 4 | -24/+23 | |
| * | | | | pool: Handle 32 bit systems | Vicent Marti | 2015-10-28 | 1 | -1/+1 | |
| * | | | | pool: Take into account malloc overhead & pool page size | Vicent Marti | 2015-10-28 | 1 | -1/+2 | |
| * | | | | repository: plug memory leak | Vicent Marti | 2015-10-28 | 1 | -0/+1 | |
| * | | | | pool: Simplify implementation | Vicent Marti | 2015-10-28 | 17 | -336/+83 | |
|/ / / / | ||||||
* | | | | Merge pull request #3489 from libgit2/vmg/reuc-insert | Vicent Marti | 2015-10-28 | 3 | -49/+66 | |
|\ \ \ \ | ||||||
| * | | | | merge: Plug memory leakvmg/reuc-insert | Vicent Marti | 2015-10-27 | 1 | -3/+3 | |
| * | | | | merge: Implement `GIT_MERGE_TREE_SKIP_REUC` | Vicent Marti | 2015-10-27 | 2 | -28/+48 | |
| * | | | | reuc: Be smarter when inserting new REUC entries | Vicent Marti | 2015-10-27 | 1 | -19/+16 | |
|/ / / / | ||||||
* | | | | Merge pull request #3485 from srajko/giterr_clear-typo-fix | Carlos Martín Nieto | 2015-10-26 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix docs typo geterr_clear -> giterr_clear | Stjepan Rajko | 2015-10-26 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #3477 from linquize/inttypes.h | Edward Thomson | 2015-10-23 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | inttypes.h is built-in header file since MSVC 2013 | Linquize | 2015-10-22 | 1 | -1/+1 | |
* | | | | Merge pull request #3483 from ethomson/cmake_xcode | Carlos Martín Nieto | 2015-10-23 | 1 | -9/+9 | |
|\ \ \ \ | ||||||
| * | | | | cmake: split sources into original paths for Xcode and MSVC | Edward Thomson | 2015-10-22 | 1 | -9/+9 | |
* | | | | | Merge pull request #3481 from ethomson/xdiff_include | Carlos Martín Nieto | 2015-10-23 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | xdiff: reference util.h in parent directory | Edward Thomson | 2015-10-22 | 1 | -1/+1 | |
* | | | | | | Merge pull request #3482 from ethomson/merge_fail_on_conflict | Vicent Marti | 2015-10-23 | 5 | -6/+38 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT | Edward Thomson | 2015-10-22 | 5 | -6/+38 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3480 from ethomson/nsecs | Carlos Martín Nieto | 2015-10-22 | 14 | -1/+96 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | diff: ignore nsecs when diffing | Edward Thomson | 2015-10-22 | 1 | -1/+3 | |
| * | | | | index: test that we round-trip nsecs | Edward Thomson | 2015-10-22 | 13 | -0/+93 | |
| |/ / / | ||||||
* | | | | Merge pull request #3475 from libgit2/cmn/programdata-config | Edward Thomson | 2015-10-21 | 9 | -10/+123 | |
|\ \ \ \ | ||||||
| * | | | | config: add a ProgramData levelcmn/programdata-config | Carlos Martín Nieto | 2015-10-21 | 9 | -10/+123 | |
* | | | | | Merge pull request #3479 from ethomson/cplusplus | Carlos Martín Nieto | 2015-10-21 | 1 | -6/+8 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | win32: add c linkage guard around inttypes.h inclusion | Edward Thomson | 2015-10-21 | 1 | -6/+8 | |
|/ / / / | ||||||
* | | | | Merge pull request #3478 from libgit2/vmg/crud | Vicent Marti | 2015-10-21 | 6 | -8/+30 | |
|\ \ \ \ | |/ / / |/| | | |