Show patches with: Series = [v2,01/20] merge-ort: setup basic internal data structures       |   20 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v2,20/20] merge-ort: free data structures in merge_finalize() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,19/20] merge-ort: add implementation of record_conflicted_index_entries() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,18/20] tree: enable cmp_cache_name_compare() to be used elsewhere [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,17/20] merge-ort: add implementation of checkout() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,16/20] merge-ort: basic outline for merge_switch_to_result() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,15/20] merge-ort: step 3 of tree writing -- handling subdirectories as we go [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,14/20] merge-ort: step 2 of tree writing -- function to create tree object [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,12/20] merge-ort: have process_entries operate in a defined order [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,11/20] merge-ort: add a preliminary simple process_entries() implementation [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,10/20] merge-ort: avoid recursing into identical trees [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,09/20] merge-ort: record stage and auxiliary info for every path [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,08/20] merge-ort: compute a few more useful fields for collect_merge_info [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,07/20] merge-ort: avoid repeating fill_tree_descriptor() on the same tree [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,06/20] merge-ort: implement a very basic collect_merge_info() [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,05/20] merge-ort: add an err() function similar to one from merge-recursive [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,04/20] merge-ort: use histogram diff [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,03/20] merge-ort: port merge_start() from merge-recursive [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,02/20] merge-ort: add some high-level algorithm structure [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New
[v2,01/20] merge-ort: setup basic internal data structures [v2,01/20] merge-ort: setup basic internal data structures - - - --- 2020-12-04 Elijah Newren New