summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-01-04merge-ort: add handling for different types of files at same pathLibravatar Elijah Newren1-4/+103
2021-01-04merge-ort: copy find_first_merges() implementation from merge-recursive.cLibravatar Elijah Newren1-1/+56
2021-01-04merge-ort: implement format_commit()Libravatar Elijah Newren1-1/+13
2021-01-04merge-ort: copy and adapt merge_submodule() from merge-recursive.cLibravatar Elijah Newren1-1/+125
2021-01-04merge-ort: copy and adapt merge_3way() from merge-recursive.cLibravatar Elijah Newren1-1/+53
2021-01-04merge-ort: flesh out implementation of handle_content_merge()Libravatar Elijah Newren1-6/+143
2021-01-04merge-ort: handle book-keeping around two- and three-way content mergeLibravatar Elijah Newren1-11/+41
2021-01-04merge-ort: implement unique_path() helperLibravatar Elijah Newren1-1/+24
2021-01-04merge-ort: handle directory/file conflicts that remainLibravatar Elijah Newren1-2/+84
2021-01-04merge-ort: handle D/F conflict where directory disappears due to mergeLibravatar Elijah Newren1-1/+22
2020-12-13merge-ort: add modify/delete handling and delayed output processingLibravatar Elijah Newren1-2/+98
2020-12-13merge-ort: add die-not-implemented stub handle_content_merge() functionLibravatar Elijah Newren1-0/+14
2020-12-13merge-ort: add function grouping commentsLibravatar Elijah Newren1-0/+21
2020-12-13merge-ort: add a paths_to_free field to merge_options_internalLibravatar Elijah Newren1-1/+25
2020-12-13merge-ort: add a path_conflict field to merge_options_internalLibravatar Elijah Newren1-0/+7
2020-12-13merge-ort: add a clear_internal_opts helperLibravatar Elijah Newren1-16/+24
2020-12-13merge-ort: add a few includesLibravatar Elijah Newren1-0/+2
2020-12-13merge-ort: free data structures in merge_finalize()Libravatar Elijah Newren1-1/+31
2020-12-13merge-ort: add implementation of record_conflicted_index_entries()Libravatar Elijah Newren1-1/+87
2020-12-13tree: enable cmp_cache_name_compare() to be used elsewhereLibravatar Elijah Newren2-1/+3
2020-12-13merge-ort: add implementation of checkout()Libravatar Elijah Newren1-1/+44
2020-12-13merge-ort: basic outline for merge_switch_to_result()Libravatar Elijah Newren1-1/+41
2020-12-13merge-ort: step 3 of tree writing -- handling subdirectories as we goLibravatar Elijah Newren1-8/+234
2020-12-13merge-ort: step 2 of tree writing -- function to create tree objectLibravatar Elijah Newren1-1/+66
2020-12-13merge-ort: step 1 of tree writing -- record basenames, modes, and oidsLibravatar Elijah Newren1-3/+37
2020-12-13merge-ort: have process_entries operate in a defined orderLibravatar Elijah Newren1-3/+50
2020-12-13merge-ort: add a preliminary simple process_entries() implementationLibravatar Elijah Newren1-1/+102
2020-12-13merge-ort: avoid recursing into identical treesLibravatar Elijah Newren1-0/+13
2020-12-13merge-ort: record stage and auxiliary info for every pathLibravatar Elijah Newren1-7/+90
2020-12-13merge-ort: compute a few more useful fields for collect_merge_infoLibravatar Elijah Newren1-0/+36
2020-12-13merge-ort: avoid repeating fill_tree_descriptor() on the same treeLibravatar Elijah Newren1-4/+22
2020-12-13merge-ort: implement a very basic collect_merge_info()Libravatar Elijah Newren1-1/+134
2020-12-13merge-ort: add an err() function similar to one from merge-recursiveLibravatar Elijah Newren2-3/+37
2020-12-13merge-ort: use histogram diffLibravatar Elijah Newren1-0/+4
2020-12-13merge-ort: port merge_start() from merge-recursiveLibravatar Elijah Newren1-1/+44
2020-12-13merge-ort: add some high-level algorithm structureLibravatar Elijah Newren1-1/+67
2020-12-13merge-ort: setup basic internal data structuresLibravatar Elijah Newren1-0/+147
2020-11-11Merge branch 'en/strmap' into en/merge-ort-implLibravatar Junio C Hamano27-170/+621
2020-11-11shortlog: use strset from strmap.hLibravatar Elijah Newren1-57/+4
2020-11-11Use new HASHMAP_INIT macro to simplify hashmap initializationLibravatar Elijah Newren6-38/+16
2020-11-11strmap: take advantage of FLEXPTR_ALLOC_STR when relevantLibravatar Elijah Newren2-16/+20
2020-11-11strmap: enable allocations to come from a mem_poolLibravatar Elijah Newren2-12/+30
2020-11-06strmap: add a strset sub-typeLibravatar Elijah Newren2-0/+80
2020-11-06strmap: split create_entry() out of strmap_put()Libravatar Elijah Newren1-14/+23
2020-11-04strmap: add functions facilitating use as a string->int mapLibravatar Elijah Newren2-0/+105
2020-11-04strmap: enable faster clearing and reusing of strmapsLibravatar Elijah Newren2-0/+12
2020-11-04strmap: add more utility functionsLibravatar Elijah Newren2-0/+54
2020-11-02merge,rebase,revert: select ort or recursive by config or environmentLibravatar Elijah Newren5-15/+104
2020-11-02strmap: new utility functionsLibravatar Elijah Newren3-0/+165
2020-11-02hashmap: provide deallocation function namesLibravatar Elijah Newren22-53/+63
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 05:37:22 +0000