| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | diff: don't feed large files to xdiff | Edward Thomson | 2015-10-05 | 1 | -2/+2 |
| | | |||||
| * | merge_file: treat large files as binary | Edward Thomson | 2015-10-05 | 1 | -21/+75 |
| | | | | | | | | | xdiff craps the bed on large files. Treat very large files as binary, so that it doesn't even have to try. Refactor our merge binary handling to better match git.git, which looks for a NUL in the first 8000 bytes. | ||||
| * | Added options to enable patience and minimal diff drivers | Jacques Germishuys | 2015-03-16 | 1 | -0/+6 |
| | | |||||
| * | Collapse whitespace flags into git_merge_file_flags_t | Jacques Germishuys | 2015-03-16 | 1 | -3/+3 |
| | | |||||
| * | Allow for merges with whitespace discrepancies | Jacques Germishuys | 2015-03-16 | 1 | -0/+7 |
| | | |||||
| * | Cleanups | Russell Belfer | 2014-03-31 | 1 | -2/+2 |
| | | |||||
| * | Const up members of git_merge_file_result | Edward Thomson | 2014-03-31 | 1 | -2/+2 |
| | | |||||
| * | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 1 | -83/+180 |
| | | |||||
| * | diff: rename the file's 'oid' to 'id' | Carlos Martín Nieto | 2014-01-25 | 1 | -1/+1 |
| | | | | | In the same vein as the previous commits in this series. | ||||
| * | index: rename an entry's id to 'id' | Carlos Martín Nieto | 2014-01-25 | 1 | -1/+1 |
| | | | | | This was not converted when we converted the rest, so do it now. | ||||
| * | Support union merges | Edward Thomson | 2014-01-20 | 1 | -0/+2 |
| | | |||||
| * | Introduce diff3 mode for checking out conflicts | Edward Thomson | 2014-01-20 | 1 | -0/+3 |
| | | |||||
| * | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 1 | -4/+7 |
| | | | | | | | | | | | | The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem. | ||||
| * | checkout (from index) can write conflicts | Edward Thomson | 2013-10-16 | 1 | -1/+1 |
| | | |||||
| * | Fix trailing whitespaces | nulltoken | 2013-05-15 | 1 | -24/+23 |
| | | |||||
| * | merge! | Edward Thomson | 2013-04-30 | 1 | -0/+175 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |