git - Git: sistema de control de versiones

Age	Commit message (Expand)	Author
2020-12-17	merge-ort: implement merge_incore_recursive()	Elijah Newren
2020-12-17	merge-ort: make clear_internal_opts() aware of partial clearing	Elijah Newren
2020-12-17	merge-ort: copy a few small helper functions from merge-recursive.c	Elijah Newren
2020-12-13	merge-ort: add modify/delete handling and delayed output processing	Elijah Newren
2020-12-13	merge-ort: add die-not-implemented stub handle_content_merge() function	Elijah Newren
2020-12-13	merge-ort: add function grouping comments	Elijah Newren
2020-12-13	merge-ort: add a paths_to_free field to merge_options_internal	Elijah Newren
2020-12-13	merge-ort: add a path_conflict field to merge_options_internal	Elijah Newren
2020-12-13	merge-ort: add a clear_internal_opts helper	Elijah Newren
2020-12-13	merge-ort: add a few includes	Elijah Newren
2020-12-13	merge-ort: free data structures in merge_finalize()	Elijah Newren
2020-12-13	merge-ort: add implementation of record_conflicted_index_entries()	Elijah Newren
2020-12-13	merge-ort: add implementation of checkout()	Elijah Newren
2020-12-13	merge-ort: basic outline for merge_switch_to_result()	Elijah Newren
2020-12-13	merge-ort: step 3 of tree writing -- handling subdirectories as we go	Elijah Newren
2020-12-13	merge-ort: step 2 of tree writing -- function to create tree object	Elijah Newren
2020-12-13	merge-ort: step 1 of tree writing -- record basenames, modes, and oids	Elijah Newren
2020-12-13	merge-ort: have process_entries operate in a defined order	Elijah Newren
2020-12-13	merge-ort: add a preliminary simple process_entries() implementation	Elijah Newren
2020-12-13	merge-ort: avoid recursing into identical trees	Elijah Newren
2020-12-13	merge-ort: record stage and auxiliary info for every path	Elijah Newren
2020-12-13	merge-ort: compute a few more useful fields for collect_merge_info	Elijah Newren
2020-12-13	merge-ort: avoid repeating fill_tree_descriptor() on the same tree	Elijah Newren
2020-12-13	merge-ort: implement a very basic collect_merge_info()	Elijah Newren
2020-12-13	merge-ort: add an err() function similar to one from merge-recursive	Elijah Newren
2020-12-13	merge-ort: use histogram diff	Elijah Newren
2020-12-13	merge-ort: port merge_start() from merge-recursive	Elijah Newren
2020-12-13	merge-ort: add some high-level algorithm structure	Elijah Newren
2020-12-13	merge-ort: setup basic internal data structures	Elijah Newren
2020-10-27	merge-ort: barebones API of new merge strategy with empty implementation	Elijah Newren