diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-11 13:58:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-11 13:58:43 -0800 |
| commit | a21e27ef6bd72e38ec96a2b1a259eb48759c1d48 (patch) | |
| tree | 963ba02914e454d2ae5c993eeb1051d5544ad0e0 /commit.h | |
| parent | c6102b758572c7515f606b2423dfe38934fe6764 (diff) | |
| parent | 203c872c4f29e08867d572eca4f18cd1f39f9e4b (diff) | |
Merge branch 'en/ort-directory-rename'
ORT merge strategy learns to infer "renamed directory" while
merging.
* en/ort-directory-rename:
merge-ort: fix a directory rename detection bug
merge-ort: process_renames() now needs more defensiveness
merge-ort: implement apply_directory_rename_modifications()
merge-ort: add a new toplevel_dir field
merge-ort: implement handle_path_level_conflicts()
merge-ort: implement check_for_directory_rename()
merge-ort: implement apply_dir_rename() and check_dir_renamed()
merge-ort: implement compute_collisions()
merge-ort: modify collect_renames() for directory rename handling
merge-ort: implement handle_directory_level_conflicts()
merge-ort: implement compute_rename_counts()
merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
merge-ort: add outline of get_provisional_directory_renames()
merge-ort: add outline for computing directory renames
merge-ort: collect which directories are removed in dirs_removed
merge-ort: initialize and free new directory rename data structures
merge-ort: add new data structures for directory rename detection
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions