| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | revert tests: always use core.autocrlf=false in tests | Edward Thomson | 2014-10-27 | 12 | -4/+2 |
| | | |||||
| * | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 23 | -1/+9 |
| | | | | | | | | | | | | 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. | ||||
| * | Introduce git_revert to revert a single commit | Edward Thomson | 2013-12-02 | 45 | -0/+91 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |