]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1c192d 9ae39fe)
Merge branch 'en/merge-ort-restart-optim-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:20:58 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:20:58 +0000 (14:20 -0800)
The merge-ort misbehaved when merge.renameLimit configuration is
set too low and failed to find all renames.

* en/merge-ort-restart-optim-fix:
  merge-ort: avoid assuming all renames detected

1  2 
merge-ort.c patch | diff1 | diff2 | blob | history

diff --cc merge-ort.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.