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