| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |