merge-ort: add implementation of checkout()
Elijah Newren committed almost 6 years ago
merge-ort: basic outline for merge_switch_to_result()
Elijah Newren committed almost 6 years ago
merge-ort: step 3 of tree writing -- handling subdirectories as we go
Elijah Newren committed almost 6 years ago
merge-ort: step 2 of tree writing -- function to create tree object
Elijah Newren committed almost 6 years ago
merge-ort: step 1 of tree writing -- record basenames, modes, and oids
Elijah Newren committed almost 6 years ago
merge-ort: have process_entries operate in a defined order
Elijah Newren committed almost 6 years ago
merge-ort: add a preliminary simple process_entries() implementation
Elijah Newren committed almost 6 years ago
merge-ort: avoid recursing into identical trees
Elijah Newren committed almost 6 years ago
merge-ort: record stage and auxiliary info for every path
Elijah Newren committed almost 6 years ago
merge-ort: compute a few more useful fields for collect_merge_info
Elijah Newren committed almost 6 years ago
merge-ort: avoid repeating fill_tree_descriptor() on the same tree
Elijah Newren committed almost 6 years ago
merge-ort: implement a very basic collect_merge_info()
Elijah Newren committed almost 6 years ago
merge-ort: add an err() function similar to one from merge-recursive
Elijah Newren committed almost 6 years ago
Elijah Newren committed almost 6 years ago
merge-ort: port merge_start() from merge-recursive
Elijah Newren committed almost 6 years ago
merge-ort: add some high-level algorithm structure
Elijah Newren committed almost 6 years ago
merge-ort: setup basic internal data structures
Elijah Newren committed almost 6 years ago
rev-parse: add option for absolute or relative path formatting
brian m. carlson committed almost 6 years ago
abspath: add a function to resolve paths with missing components
brian m. carlson committed almost 6 years ago
t7900: use --fixed-value in git-maintenance tests
Josh Steadmon committed almost 6 years ago