Show patches with: Series = Complete merge-ort implementation...almost       |   10 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v2,10/10] merge-recursive: add a bunch of FIXME comments documenting known bugs Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New
[v2,09/10] merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New
[v2,08/10] t: mark several submodule merging tests as fixed under merge-ort Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New
[v2,07/10] merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New
[v2,06/10] t6428: new test for SKIP_WORKTREE handling and conflicts Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New
[v2,05/10] merge-ort: support subtree shifting Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New
[v2,04/10] merge-ort: let renormalization change modify/delete into clean delete Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New
[v2,03/10] merge-ort: have ll_merge() use a special attr_index for renormalization Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New
[v2,02/10] merge-ort: add a special minimal index just for renormalization Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New
[v2,01/10] merge-ort: use STABLE_QSORT instead of QSORT where required Complete merge-ort implementation...almost - - - --- 2021-03-09 Elijah Newren New