The fifteenth batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 28, 2025 at 12:02 UTC e813a0200a7121b97fec535f0d0b460b0a33356c
1 file changed +9
Documentation/RelNotes/2.51.0.adoc
+9
@@ -103,6 +103,10 @@ Performance, Internal Implementation, Development Support etc.
103 * GIT_TEST_INSTALLED was not honored in the recent topic related to
104 SHA256 hashes, which has been corrected.
105
106 + * The pop_most_recent_commit() function can have quite expensive
107 + worst case performance characteristics, which has been optimized by
108 + using prio-queue data structure.
109 +
110
111 Fixes since v2.50
112 -----------------
@@ -225,6 +229,11 @@ including security updates, are included in this release.
229 patches off.
230 (merge 1f0fed312a bc/contribution-under-non-real-names later to maint).
231
232 + * "git commit" that concludes a conflicted merge failed to notice and remove
233 + existing comment added automatically (like "# Conflicts:") when the
234 + core.commentstring is set to 'auto'.
235 + (merge 92b7c7c9f5 ac/auto-comment-char-fix later to maint).
236 +
237 * Other code cleanup, docfix, build fix, etc.
238 (merge b257adb571 lo/my-first-ow-doc-update later to maint).
239 (merge 8b34b6a220 ly/sequencer-update-squash-is-fixup-only later to maint).