| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | introduce `git_index_entry_is_conflict` | Edward Thomson | 2015-05-28 | 1 | -2/+2 |
| | | | | | | | | | | 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. | ||||
| * | conflict tests: use GIT_IDXENTRY_STAGE_SET | Edward Thomson | 2015-05-28 | 1 | -10/+10 |
| | | |||||
| * | index: validate mode of new conflicts | Edward Thomson | 2015-05-28 | 1 | -1/+8 |
| | | |||||
| * | conflicts: when adding conflicts, remove staged | Edward Thomson | 2015-05-28 | 1 | -0/+50 |
| | | | | | | | When adding a conflict for some path, remove the staged entry. Otherwise, an illegal index (with both stage 0 and high-stage entries) would result. | ||||
| * | Introduce cl_assert_equal_oid | Edward Thomson | 2014-07-01 | 1 | -13/+13 |
| | | |||||
| * | index: rename an entry's id to 'id' | Carlos MartÃn Nieto | 2014-01-25 | 1 | -20/+20 |
| | | | | | This was not converted when we converted the rest, so do it now. | ||||
| * | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 1 | -0/+287 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |