| Commit message (Expand) | Author | Files | Lines | |
|---|---|---|---|---|
| 2021-03-20 | merge-recursive: add a bunch of FIXME comments documenting known bugs | Elijah Newren | 1 | -0/+37 |
| 2021-03-20 | merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict | Elijah Newren | 6 | -0/+20 |
| 2021-03-20 | t: mark several submodule merging tests as fixed under merge-ort | Elijah Newren | 5 | -9/+22 |
| 2021-03-20 | merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries | Elijah Newren | 2 | -15/+32 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |