tree 385480a0dfd083c1dcce8485eabbe6b1d062fee6
parent 700696bcfc8dc0bbb763ba8a0c91688ad6c1fa7b
parent f78cf976172fbad79a9ca4fc158f384fb868f177
author Junio C Hamano <gitster@pobox.com> 1614636176 -0800
committer Junio C Hamano <gitster@pobox.com> 1614636176 -0800

Merge branch 'en/diffcore-rename'

Performance optimization work on the rename detection continues.

* en/diffcore-rename:
  merge-ort: call diffcore_rename() directly
  gitdiffcore doc: mention new preliminary step for rename detection
  diffcore-rename: guide inexact rename detection based on basenames
  diffcore-rename: complete find_basename_matches()
  diffcore-rename: compute basenames of source and dest candidates
  t4001: add a test comparing basename similarity and content similarity
  diffcore-rename: filter rename_src list when possible
  diffcore-rename: no point trying to find a match better than exact