Show patches with: Series = Declare merge-ort ready for general usage       |   13 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v2,13/13] Add testing with merge-ort merge strategy Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,12/13] t6423: mark remaining expected failure under merge-ort as such Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,11/13] Revert "merge-ort: ignore the directory rename split conflict for now" Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,10/13] merge-recursive: add a bunch of FIXME comments documenting known bugs Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,09/13] merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,08/13] t: mark several submodule merging tests as fixed under merge-ort Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,07/13] merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,06/13] t6428: new test for SKIP_WORKTREE handling and conflicts Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,05/13] merge-ort: support subtree shifting Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,04/13] merge-ort: let renormalization change modify/delete into clean delete Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,03/13] merge-ort: have ll_merge() use a special attr_index for renormalization Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,02/13] merge-ort: add a special minimal index just for renormalization Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New
[v2,01/13] merge-ort: use STABLE_QSORT instead of QSORT where required Declare merge-ort ready for general usage - - - --- 2021-03-17 Elijah Newren New