From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Jan 2026 05:54:28 +0000 (-0800)
Subject: The 17th batch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8745eae506f700657882b9e32b2aa00f234a6fb6;p=thirdparty%2Fgit.git

The 17th batch

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

diff --git a/Documentation/RelNotes/2.53.0.adoc b/Documentation/RelNotes/2.53.0.adoc
index 32b6966c9e..35a1ab91ed 100644
--- a/Documentation/RelNotes/2.53.0.adoc
+++ b/Documentation/RelNotes/2.53.0.adoc
@@ -238,6 +238,13 @@ Fixes since v2.52
    has been corrected.
    (merge 979ee83e8a en/ort-recursive-d-f-conflict-fix later to maint).
 
+ * Diagnose invalid bundle-URI that lack the URI entry, instead of
+   crashing.
+   (merge 7796c14a1a sb/bundle-uri-without-uri later to maint).
+
+ * Mailmap update for Karsten
+   (merge e97678c4ef js/mailmap-karsten-blees later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 46207a54cc qj/doc-http-bad-want-response later to maint).
    (merge df90eccd93 kh/doc-commit-extra-references later to maint).
@@ -263,3 +270,4 @@ Fixes since v2.52
    (merge abf05d856f rs/show-branch-prio-queue later to maint).
    (merge 06188ea5f3 rs/parse-config-expiry-simplify later to maint).
    (merge 861dbb1586 dd/t5403-modernise later to maint).
+   (merge acffc5e9e5 ja/doc-synopsis-style-more later to maint).