| commit | ec59da6015c457e84953a802fc6484ae2da2d774 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sat, 13 Mar 2021 22:22:07 +0000 (13 22:22 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Mar 2021 21:32:56 +0000 (18 14:32 -0700) | ||
| tree | 7fd53279daab6f796b5c7d5422c13e34d9ab76e2 | treesnapshot (tar.gz zip) |
| parent | bf238b71377e924066ca5155a787c167177f706c | commitdiff |
merge-ort: record the reason that we want a rename for a file
There are two different reasons we might want a rename for a file -- for
three-way content merging or as part of directory rename detection.
Record the reason. diffcore-rename will potentially be able to filter
some of the ones marked as needed only for directory rename detection,
if it can determine those directory renames based solely on renames
found via exact rename detection and basename-guided rename detection.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
There are two different reasons we might want a rename for a file -- for
three-way content merging or as part of directory rename detection.
Record the reason. diffcore-rename will potentially be able to filter
some of the ones marked as needed only for directory rename detection,
if it can determine those directory renames based solely on renames
found via exact rename detection and basename-guided rename detection.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diffcore.h | diffblobblamehistory | |
| merge-ort.c | diffblobblamehistory |