Show patches with: Submitter = Elijah Newren       |    Archived = No       |   1285 patches
« 1 2 ... 10 11 12 13 »
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v2,06/10] merge-ort: copy and adapt merge_3way() from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren Accepted
[v2,05/10] merge-ort: flesh out implementation of handle_content_merge() merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren Accepted
[v2,04/10] merge-ort: handle book-keeping around two- and three-way content merge merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren Accepted
[v2,03/10] merge-ort: implement unique_path() helper merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren Accepted
[v2,02/10] merge-ort: handle directory/file conflicts that remain merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren Accepted
[v2,01/10] merge-ort: handle D/F conflict where directory disappears due to merge merge-ort: add more handling of basic conflict types - - - --- 2021-01-01 Elijah Newren Accepted
[v3,9/9] diffcore-rename: remove unnecessary duplicate entry checks diffcore-rename improvements - - - --- 2020-12-29 Elijah Newren Accepted
[v3,8/9] diffcore-rename: accelerate rename_dst setup diffcore-rename improvements - - - --- 2020-12-29 Elijah Newren Accepted
[v3,7/9] diffcore-rename: simplify and accelerate register_rename_src() diffcore-rename improvements - - - --- 2020-12-29 Elijah Newren Accepted
[v3,6/9] t4058: explore duplicate tree entry handling in a bit more detail diffcore-rename improvements - - - --- 2020-12-29 Elijah Newren Accepted
[v3,5/9] t4058: add more tests and documentation for duplicate tree entry handling diffcore-rename improvements - - - --- 2020-12-29 Elijah Newren Accepted
[v3,4/9] diffcore-rename: reduce jumpiness in progress counters diffcore-rename improvements - - - --- 2020-12-29 Elijah Newren Accepted
[v3,3/9] diffcore-rename: simplify limit check diffcore-rename improvements - - - --- 2020-12-29 Elijah Newren Accepted
[v3,2/9] diffcore-rename: avoid usage of global in too_many_rename_candidates() diffcore-rename improvements - - - --- 2020-12-29 Elijah Newren Accepted
[v3,1/9] diffcore-rename: rename num_create to num_destinations diffcore-rename improvements - - - --- 2020-12-29 Elijah Newren Accepted
[10/10] merge-ort: add handling for different types of files at same path merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[09/10] merge-ort: copy find_first_merges() implementation from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[08/10] merge-ort: implement format_commit() merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[07/10] merge-ort: copy and adapt merge_submodule() from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[06/10] merge-ort: copy and adapt merge_3way() from merge-recursive.c merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[05/10] merge-ort: flesh out implementation of handle_content_merge() merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[04/10] merge-ort: handle book-keeping around two- and three-way content merge merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[03/10] merge-ort: implement unique_path() helper merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[02/10] merge-ort: handle directory/file conflicts that remain merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[01/10] merge-ort: handle D/F conflict where directory disappears due to merge merge-ort: add more handling of basic conflict types - - - --- 2020-12-18 Elijah Newren Superseded
[v5,4/4] merge-ort: implement merge_incore_recursive() merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Accepted
[v5,3/4] merge-ort: make clear_internal_opts() aware of partial clearing merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Accepted
[v5,2/4] merge-ort: copy a few small helper functions from merge-recursive.c merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Accepted
[v5,1/4] commit: move reverse_commit_list() from merge-recursive merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Accepted
[v3,3/3] merge-ort: implement merge_incore_recursive() merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v3,2/3] merge-ort: make clear_internal_opts() aware of partial clearing merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v3,1/3] merge-ort: copy a few small helper functions from merge-recursive.c merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v2,3/3] merge-ort: implement merge_incore_recursive() merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v2,2/3] merge-ort: make clear_internal_opts() aware of partial clearing merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v2,1/3] merge-ort: copy a few small helper functions from merge-recursive.c merge-ort: implement recursive merges - - - --- 2020-12-16 Elijah Newren Superseded
[v3,11/11] merge-ort: add implementation of type-changed rename handling merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,10/11] merge-ort: add implementation of normal rename handling merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,09/11] merge-ort: add implementation of rename collisions merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,08/11] merge-ort: add implementation of rename/delete conflicts merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,07/11] merge-ort: add implementation of both sides renaming differently merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,06/11] merge-ort: add implementation of both sides renaming identically merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,05/11] merge-ort: add basic outline for process_renames() merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,04/11] merge-ort: implement compare_pairs() and collect_renames() merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,03/11] merge-ort: implement detect_regular_renames() merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,02/11] merge-ort: add initial outline for basic rename detection merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[v3,01/11] merge-ort: add basic data structures for handling renames merge-ort: add basic rename detection - - - --- 2020-12-15 Elijah Newren Accepted
[3/3] merge-ort: implement merge_incore_recursive() merge-ort: implement recursive merges - - - --- 2020-12-15 Elijah Newren Superseded
[2/3] merge-ort: make clear_internal_opts() aware of partial clearing merge-ort: implement recursive merges - - - --- 2020-12-15 Elijah Newren Superseded
[1/3] merge-ort: copy a few small helper functions from merge-recursive.c merge-ort: implement recursive merges - - - --- 2020-12-15 Elijah Newren Superseded
[v2,11/11] merge-ort: add implementation of type-changed rename handling merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,10/11] merge-ort: add implementation of normal rename handling merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,09/11] merge-ort: add implementation of rename/delete conflicts merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,08/11] merge-ort: add implementation of rename collisions merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,07/11] merge-ort: add implementation of both sides renaming differently merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,06/11] merge-ort: add implementation of both sides renaming identically merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,05/11] merge-ort: add basic outline for process_renames() merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,04/11] merge-ort: implement compare_pairs() and collect_renames() merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,03/11] merge-ort: implement detect_regular_renames() merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,02/11] merge-ort: add initial outline for basic rename detection merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v2,01/11] merge-ort: add basic data structures for handling renames merge-ort: add basic rename detection - - - --- 2020-12-14 Elijah Newren Superseded
[v3,20/20] merge-ort: free data structures in merge_finalize() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,19/20] merge-ort: add implementation of record_conflicted_index_entries() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,18/20] tree: enable cmp_cache_name_compare() to be used elsewhere fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,17/20] merge-ort: add implementation of checkout() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,16/20] merge-ort: basic outline for merge_switch_to_result() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,15/20] merge-ort: step 3 of tree writing -- handling subdirectories as we go fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,14/20] merge-ort: step 2 of tree writing -- function to create tree object fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,13/20] merge-ort: step 1 of tree writing -- record basenames, modes, and oids fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,12/20] merge-ort: have process_entries operate in a defined order fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,11/20] merge-ort: add a preliminary simple process_entries() implementation fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,10/20] merge-ort: avoid recursing into identical trees fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,09/20] merge-ort: record stage and auxiliary info for every path fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,08/20] merge-ort: compute a few more useful fields for collect_merge_info fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,07/20] merge-ort: avoid repeating fill_tree_descriptor() on the same tree fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,06/20] merge-ort: implement a very basic collect_merge_info() fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,05/20] merge-ort: add an err() function similar to one from merge-recursive fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,04/20] merge-ort: use histogram diff fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,03/20] merge-ort: port merge_start() from merge-recursive fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,02/20] merge-ort: add some high-level algorithm structure fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v3,01/20] merge-ort: setup basic internal data structures fundamentals of merge-ort implementation - - - --- 2020-12-13 Elijah Newren Accepted
[v2,9/9] diffcore-rename: remove unneccessary duplicate entry checks diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,8/9] diffcore-rename: accelerate rename_dst setup diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,7/9] diffcore-rename: simplify and accelerate register_rename_src() diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,6/9] t4058: explore duplicate tree entry handling in a bit more detail diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,5/9] t4058: add more tests and documentation for duplicate tree entry handling diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,4/9] diffcore-rename: reduce jumpiness in progress counters diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,3/9] diffcore-rename: simplify limit check diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,2/9] diffcore-rename: avoid usage of global in too_many_rename_candidates() diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[v2,1/9] diffcore-rename: rename num_create to num_destinations diffcore-rename improvements - - - --- 2020-12-11 Elijah Newren Accepted
[11/11] merge-ort: add implementation of type-changed rename handling merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[10/11] merge-ort: add implementation of normal rename handling merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[09/11] merge-ort: add implementation of rename/delete conflicts merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[08/11] merge-ort: add implementation of rename collisions merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[07/11] merge-ort: add implementation of both sides renaming differently merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[06/11] merge-ort: add implementation of both sides renaming identically merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[05/11] merge-ort: add basic outline for process_renames() merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[04/11] merge-ort: implement compare_pairs() and collect_renames() merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[03/11] merge-ort: implement detect_regular_renames() merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[02/11] merge-ort: add initial outline for basic rename detection merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
[01/11] merge-ort: add basic data structures for handling renames merge-ort: add basic rename detection - - - --- 2020-12-09 Elijah Newren Superseded
« 1 2 ... 10 11 12 13 »