tree.h API: expose read_tree_1() as read_tree_at()
Ævar Arnfjörð Bjarmason committed over 5 years ago
archive: stop passing "stage" through read_tree_recursive()
Ævar Arnfjörð Bjarmason committed over 5 years ago
ls-files: refactor away read_tree()
Ævar Arnfjörð Bjarmason committed over 5 years ago
ls-files: don't needlessly pass around stage variable
Ævar Arnfjörð Bjarmason committed over 5 years ago
tree.c API: move read_tree() into builtin/ls-files.c
Ævar Arnfjörð Bjarmason committed over 5 years ago
ls-files tests: add meaningful --with-tree tests
Ævar Arnfjörð Bjarmason committed over 5 years ago
show tests: add test for "git show <tree>"
Ævar Arnfjörð Bjarmason committed over 5 years ago
Add testing with merge-ort merge strategy
Elijah Newren committed over 5 years ago
t6423: mark remaining expected failure under merge-ort as such
Elijah Newren committed over 5 years ago
Revert "merge-ort: ignore the directory rename split conflict for now"
Elijah Newren committed over 5 years ago
merge-recursive: add a bunch of FIXME comments documenting known bugs
Elijah Newren committed over 5 years ago
merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict
Elijah Newren committed over 5 years ago
t: mark several submodule merging tests as fixed under merge-ort
Elijah Newren committed over 5 years ago
merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
Elijah Newren committed over 5 years ago
t6428: new test for SKIP_WORKTREE handling and conflicts
Elijah Newren committed over 5 years ago
merge-ort: support subtree shifting
Elijah Newren committed over 5 years ago
merge-ort: let renormalization change modify/delete into clean delete
Elijah Newren committed over 5 years ago
merge-ort: have ll_merge() use a special attr_index for renormalization
Elijah Newren committed over 5 years ago
merge-ort: add a special minimal index just for renormalization
Elijah Newren committed over 5 years ago
merge-ort: use STABLE_QSORT instead of QSORT where required
Elijah Newren committed over 5 years ago