Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | repo_read_index: clear SKIP_WORKTREE bit from files present in worktree | Elijah Newren | 2022-01-14 | 1 | -18/+5 |
* | merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries | Elijah Newren | 2021-03-20 | 1 | -2/+2 |
* | t6428: new test for SKIP_WORKTREE handling and conflicts | Elijah Newren | 2021-03-20 | 1 | -0/+158 |