| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Load merge.conflictstyle setting from config | Edward Thomson | 2014-01-20 | 1 | -0/+86 | |
| | | ||||||
| * | Introduce diff3 mode for checking out conflicts | Edward Thomson | 2014-01-20 | 1 | -1/+48 | |
| | | ||||||
| * | Don't try to merge binary files | Edward Thomson | 2014-01-20 | 1 | -0/+37 | |
| | | ||||||
| * | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 4 | -11/+11 | |
| | | | | | | | | | | | | 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. | |||||
| * | refs: remove the _with_log differentiation | Carlos MartÃn Nieto | 2014-01-15 | 3 | -3/+3 | |
| | | | | | | | Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters. | |||||
| * | Clean up warnings | Edward Thomson | 2013-12-09 | 2 | -23/+0 | |
| | | ||||||
| * | Bare naked merge and rebase | Edward Thomson | 2013-12-03 | 3 | -0/+197 | |
| | | ||||||
| * | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 12 | -0/+4055 | |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |