From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Apr 2026 18:00:10 +0000 (-0700)
Subject: A bit more post -rc1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b15384c06f77bc2d34d0d3623a8a58218313a561;p=thirdparty%2Fgit.git

A bit more post -rc1

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

diff --git a/Documentation/RelNotes/2.54.0.adoc b/Documentation/RelNotes/2.54.0.adoc
index 27dbfdc6a5..30ec959e7e 100644
--- a/Documentation/RelNotes/2.54.0.adoc
+++ b/Documentation/RelNotes/2.54.0.adoc
@@ -509,6 +509,12 @@ Fixes since v2.53
    working tree, which was broken.
    (merge 339eba65a7 th/backfill-auto-detect-sparseness-fix later to maint).
 
+ * add_files_to_cache() used diff_files() to detect only the paths that
+   are different between the index and the working tree and add them,
+   which does not need rename detection, which interfered with unnecessary
+   conflicts.
+   (merge c0ce43376b ng/add-files-to-cache-wo-rename later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge d79fff4a11 jk/remote-tracking-ref-leakfix later to maint).
    (merge 7a747f972d dd/t5403-modernise later to maint).