| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | git_diff_generated: abstract generated diffs | Edward Thomson | 2016-05-26 | 1 | -0/+1 |
| | | |||||
| * | recursive merge: add a recursion limit | Edward Thomson | 2015-11-25 | 1 | -0/+31 |
| | | |||||
| * | merge: handle conflicts in recursive base building | Edward Thomson | 2015-11-25 | 1 | -0/+80 |
| | | | | | | | | | | | | | | | | | | When building a recursive merge base, allow conflicts to occur. Use the file (with conflict markers) as the common ancestor. The user has already seen and dealt with this conflict by virtue of having a criss-cross merge. If they resolved this conflict identically in both branches, then there will be no conflict in the result. This is the best case scenario. If they did not resolve the conflict identically in the two branches, then we will generate a new conflict. If the user is simply using standard conflict output then the results will be fairly sensible. But if the user is using a mergetool or using diff3 output, then the common ancestor will be a conflict file (itself with diff3 output, haha!). This is quite terrible, but it matches git's behavior. | ||||
| * | merge tests: add complex recursive example | Edward Thomson | 2015-11-25 | 1 | -0/+28 |
| | | |||||
| * | merge tests: move expected data into own file | Edward Thomson | 2015-11-25 | 2 | -1/+3 |
| | | |||||
| * | merge: add recursive test with conflicting contents | Edward Thomson | 2015-11-25 | 1 | -0/+23 |
| | | |||||
| * | merge: add recursive test with three merge bases | Edward Thomson | 2015-11-25 | 1 | -0/+46 |
| | | |||||
| * | merge: improve test names in recursive merge tests | Edward Thomson | 2015-11-25 | 1 | -8/+8 |
| | | |||||
| * | merge: add a third-level recursive merge | Edward Thomson | 2015-11-25 | 1 | -0/+46 |
| | | |||||
| * | merge: add a second-level recursive merge | Edward Thomson | 2015-11-25 | 1 | -2/+48 |
| | | |||||
| * | merge: add simple recursive test | Edward Thomson | 2015-11-25 | 1 | -0/+110 |
| | | | | | | Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict. | ||||
| * | merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t` | Edward Thomson | 2015-11-25 | 2 | -2/+2 |
| | | |||||
| * | merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT | Edward Thomson | 2015-10-22 | 1 | -1/+17 |
| | | | | | | | Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT. | ||||
| * | iterator: use an options struct instead of args | Edward Thomson | 2015-08-28 | 1 | -6/+6 |
| | | |||||
| * | introduce `git_index_entry_is_conflict` | Edward Thomson | 2015-05-28 | 1 | -1/+1 |
| | | | | | | | | | | It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking. | ||||
| * | merge: merge iterators | Edward Thomson | 2015-05-11 | 1 | -1/+13 |
| | | |||||
| * | Collapse whitespace flags into git_merge_file_flags_t | Jacques Germishuys | 2015-03-16 | 1 | -2/+2 |
| | | |||||
| * | Renamed git_merge_options 'flags' to 'tree_flags' | Jacques Germishuys | 2015-03-16 | 1 | -1/+1 |
| | | |||||
| * | Added tests to merge files and branches with whitespace problems and fixes | Jacques Germishuys | 2015-03-16 | 1 | -0/+82 |
| | | |||||
| * | hashsig: Export as a `sys` headervmg/hashsig | Vicent Marti | 2014-10-01 | 1 | -1/+1 |
| | | |||||
| * | Introduce cl_assert_equal_oid | Edward Thomson | 2014-07-01 | 1 | -1/+1 |
| | | |||||
| * | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 5 | -11/+11 |
| | | |||||
| * | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 2 | -33/+0 |
| | | |||||
| * | index: rename an entry's id to 'id' | Carlos MartÃn Nieto | 2014-01-25 | 3 | -4/+4 |
| | | | | | This was not converted when we converted the rest, so do it now. | ||||
| * | Remove the "merge none" flag | Edward Thomson | 2014-01-20 | 1 | -105/+14 |
| | | | | | | | | The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed. | ||||
| * | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 2 | -3/+3 |
| | | | | | | | | | | | | 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. | ||||
| * | Clean up warnings | Edward Thomson | 2013-12-09 | 1 | -22/+0 |
| | | |||||
| * | Bare naked merge and rebase | Edward Thomson | 2013-12-03 | 1 | -0/+164 |
| | | |||||
| * | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 5 | -0/+1467 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |