]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7521-ignored-mode.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 75ae10b ef68c3d)
Merge branch 'en/ort-perf-batch-12'
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Jul 2021 00:42:45 +0000 (17:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Jul 2021 00:42:45 +0000 (17:42 -0700)
commit89efac81c716bb296098fd1c5482bac3ecb344c5
treed5a9e888d3858ba1b8f3b8dce037acf500f8a81dtree | snapshot
parent75ae10bc75336db031ee58d13c5037b929235912commit | diff
parentef68c3d800b9c4516f1a13038e047610882cd26fcommit | diff
Merge branch 'en/ort-perf-batch-12'

More fix-ups and optimization to "merge -sort".

* en/ort-perf-batch-12:
  merge-ort: miscellaneous touch-ups
  Fix various issues found in comments
  diffcore-rename: avoid unnecessary strdup'ing in break_idx
  merge-ort: replace string_list_df_name_compare with faster alternative
diffcore-rename.c diff1 | diff2 | blob | history
merge-ort.c diff1 | diff2 | blob | history
t/t6423-merge-rename-directories.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.