projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bde1457 ef68c3d)
Merge branch 'en/ort-perf-batch-12' into seen
authorJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:16 +0000 (16:30 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:16 +0000 (16:30 +0900)
commit59e223f92568c8192f3b28257988b185f7346923
treeda582bbdbfc2ec475d0804e05ddf47068b5ebafetree | snapshot
parentbde1457299420e3afa0dbd247ec8460af2842485commit | diff
parentef68c3d800b9c4516f1a13038e047610882cd26fcommit | diff
Merge branch 'en/ort-perf-batch-12' into seen

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.