Skip to content

Commit b15384c

Browse files
committed
A bit more post -rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2226ffa commit b15384c

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

Documentation/RelNotes/2.54.0.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,12 @@ Fixes since v2.53
509509
working tree, which was broken.
510510
(merge 339eba65a7 th/backfill-auto-detect-sparseness-fix later to maint).
511511

512+
* add_files_to_cache() used diff_files() to detect only the paths that
513+
are different between the index and the working tree and add them,
514+
which does not need rename detection, which interfered with unnecessary
515+
conflicts.
516+
(merge c0ce43376b ng/add-files-to-cache-wo-rename later to maint).
517+
512518
* Other code cleanup, docfix, build fix, etc.
513519
(merge d79fff4a11 jk/remote-tracking-ref-leakfix later to maint).
514520
(merge 7a747f972d dd/t5403-modernise later to maint).

0 commit comments

Comments
 (0)