summaryrefslogtreecommitdiff
path: root/git-request-pull.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-03-13 22:22:07 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-18 14:32:56 -0700
commitec59da6015c457e84953a802fc6484ae2da2d774 (patch)
tree7fd53279daab6f796b5c7d5422c13e34d9ab76e2 /git-request-pull.sh
parentdiffcore-rename: add computation of number of unknown renames (diff)
downloadtgif-ec59da6015c457e84953a802fc6484ae2da2d774.tar.xz
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>
Diffstat (limited to 'git-request-pull.sh')
0 files changed, 0 insertions, 0 deletions