tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2021-02-05	Merge branch 'en/ort-conflict-handling'	Junio C Hamano	1	-18/+653
2021-01-25	Merge branch 'en/merge-ort-3'	Junio C Hamano	1	-16/+430
2021-01-04	merge-ort: add handling for different types of files at same path	Elijah Newren	1	-4/+103
2021-01-04	merge-ort: copy find_first_merges() implementation from merge-recursive.c	Elijah Newren	1	-1/+56
2021-01-04	merge-ort: implement format_commit()	Elijah Newren	1	-1/+13
2021-01-04	merge-ort: copy and adapt merge_submodule() from merge-recursive.c	Elijah Newren	1	-1/+125
2021-01-04	merge-ort: copy and adapt merge_3way() from merge-recursive.c	Elijah Newren	1	-1/+53
2021-01-04	merge-ort: flesh out implementation of handle_content_merge()	Elijah Newren	1	-6/+143
2021-01-04	merge-ort: handle book-keeping around two- and three-way content merge	Elijah Newren	1	-11/+41
2021-01-04	merge-ort: implement unique_path() helper	Elijah Newren	1	-1/+24
2021-01-04	merge-ort: handle directory/file conflicts that remain	Elijah Newren	1	-2/+84
2021-01-04	merge-ort: handle D/F conflict where directory disappears due to merge	Elijah Newren	1	-1/+22
2020-12-16	merge-ort: implement merge_incore_recursive()	Elijah Newren	1	-2/+88
2020-12-16	merge-ort: make clear_internal_opts() aware of partial clearing	Elijah Newren	1	-6/+7
2020-12-16	merge-ort: copy a few small helper functions from merge-recursive.c	Elijah Newren	1	-0/+20
2020-12-15	merge-ort: add implementation of type-changed rename handling	Elijah Newren	1	-3/+32
2020-12-15	merge-ort: add implementation of normal rename handling	Elijah Newren	1	-1/+5
2020-12-15	merge-ort: add implementation of rename collisions	Elijah Newren	1	-3/+51
2020-12-15	merge-ort: add implementation of rename/delete conflicts	Elijah Newren	1	-8/+40
2020-12-15	merge-ort: add implementation of both sides renaming differently	Elijah Newren	1	-3/+55
2020-12-15	merge-ort: add implementation of both sides renaming identically	Elijah Newren	1	-2/+18
2020-12-14	merge-ort: add basic outline for process_renames()	Elijah Newren	1	-1/+97
2020-12-14	merge-ort: implement compare_pairs() and collect_renames()	Elijah Newren	1	-2/+33
2020-12-14	merge-ort: implement detect_regular_renames()	Elijah Newren	1	-1/+31
2020-12-14	merge-ort: add initial outline for basic rename detection	Elijah Newren	1	-8/+60
2020-12-14	merge-ort: add basic data structures for handling renames	Elijah Newren	1	-0/+24
2020-12-13	merge-ort: add modify/delete handling and delayed output processing	Elijah Newren	1	-2/+98
2020-12-13	merge-ort: add die-not-implemented stub handle_content_merge() function	Elijah Newren	1	-0/+14
2020-12-13	merge-ort: add function grouping comments	Elijah Newren	1	-0/+21
2020-12-13	merge-ort: add a paths_to_free field to merge_options_internal	Elijah Newren	1	-1/+25
2020-12-13	merge-ort: add a path_conflict field to merge_options_internal	Elijah Newren	1	-0/+7
2020-12-13	merge-ort: add a clear_internal_opts helper	Elijah Newren	1	-16/+24
2020-12-13	merge-ort: add a few includes	Elijah Newren	1	-0/+2
2020-12-13	merge-ort: free data structures in merge_finalize()	Elijah Newren	1	-1/+31
2020-12-13	merge-ort: add implementation of record_conflicted_index_entries()	Elijah Newren	1	-1/+87
2020-12-13	merge-ort: add implementation of checkout()	Elijah Newren	1	-1/+44
2020-12-13	merge-ort: basic outline for merge_switch_to_result()	Elijah Newren	1	-1/+41
2020-12-13	merge-ort: step 3 of tree writing -- handling subdirectories as we go	Elijah Newren	1	-8/+234
2020-12-13	merge-ort: step 2 of tree writing -- function to create tree object	Elijah Newren	1	-1/+66
2020-12-13	merge-ort: step 1 of tree writing -- record basenames, modes, and oids	Elijah Newren	1	-3/+37
2020-12-13	merge-ort: have process_entries operate in a defined order	Elijah Newren	1	-3/+50
2020-12-13	merge-ort: add a preliminary simple process_entries() implementation	Elijah Newren	1	-1/+102
2020-12-13	merge-ort: avoid recursing into identical trees	Elijah Newren	1	-0/+13
2020-12-13	merge-ort: record stage and auxiliary info for every path	Elijah Newren	1	-7/+90
2020-12-13	merge-ort: compute a few more useful fields for collect_merge_info	Elijah Newren	1	-0/+36
2020-12-13	merge-ort: avoid repeating fill_tree_descriptor() on the same tree	Elijah Newren	1	-4/+22
2020-12-13	merge-ort: implement a very basic collect_merge_info()	Elijah Newren	1	-1/+134
2020-12-13	merge-ort: add an err() function similar to one from merge-recursive	Elijah Newren	1	-2/+29
2020-12-13	merge-ort: use histogram diff	Elijah Newren	1	-0/+4
2020-12-13	merge-ort: port merge_start() from merge-recursive	Elijah Newren	1	-1/+44