refs: switch peel_ref() to peel_iterated_oid()
Jeff King committed almost 6 years ago
tests: remove uses of GIT_TEST_GETTEXT_POISON=false
Ævar Arnfjörð Bjarmason committed almost 6 years ago
tests: remove support for GIT_TEST_GETTEXT_POISON
Ævar Arnfjörð Bjarmason committed almost 6 years ago
ci: remove GETTEXT_POISON jobs
Ævar Arnfjörð Bjarmason committed almost 6 years ago
SKIP_DASHED_BUILT_INS: respect `config.mak`
Johannes Schindelin committed almost 6 years ago
Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
Junio C Hamano committed almost 6 years ago
merge-ort: fix a directory rename detection bug
Elijah Newren committed almost 6 years ago
merge-ort: process_renames() now needs more defensiveness
Elijah Newren committed almost 6 years ago
merge-ort: implement apply_directory_rename_modifications()
Elijah Newren committed almost 6 years ago
merge-ort: add a new toplevel_dir field
Elijah Newren committed almost 6 years ago
merge-ort: implement handle_path_level_conflicts()
Elijah Newren committed almost 6 years ago
merge-ort: implement check_for_directory_rename()
Elijah Newren committed almost 6 years ago
merge-ort: implement apply_dir_rename() and check_dir_renamed()
Elijah Newren committed almost 6 years ago
merge-ort: implement compute_collisions()
Elijah Newren committed almost 6 years ago
merge-ort: modify collect_renames() for directory rename handling
Elijah Newren committed almost 6 years ago
merge-ort: implement handle_directory_level_conflicts()
Elijah Newren committed almost 6 years ago
merge-ort: implement compute_rename_counts()
Elijah Newren committed almost 6 years ago
merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
Elijah Newren committed almost 6 years ago
merge-ort: add outline of get_provisional_directory_renames()
Elijah Newren committed almost 6 years ago
merge-ort: add outline for computing directory renames
Elijah Newren committed almost 6 years ago