]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3300-funny-names.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit87bfbd52e21b6e9373cd70fc148f09dcdad39f09
tree8c2c72ce24dafbb91c6140536851e2570a535698tree | snapshot
parente1c192d387ef27b3cf297688625d3f49e0068563commit | diff
parent9ae39fef7f3764537e029b57687f6a0a3163e810commit | diff
Merge branch 'en/merge-ort-restart-optim-fix'

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
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.