The 5th batch

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

Junio C Hamano committed Feb 17, 2026 at 13:29 UTC 73fd77805fc6406f31c36212846d9e2541d19321
1 file changed +21 -4
Documentation/RelNotes/2.54.0.adoc
+21 -4
@@ -20,6 +20,10 @@ UI, Workflows & Features
20 * When "git show-index" is run outside a repository, it silently
21 defaults to SHA-1; the tool now warns when this happens.
22
23 + * "git merge-file" can be run outside a repository, but it ignored
24 + all configuration, even the per-user ones. The command now uses
25 + available configuration files to find its customization.
26 +
27
28 Performance, Internal Implementation, Development Support etc.
29 --------------------------------------------------------------
@@ -39,19 +43,22 @@ Performance, Internal Implementation, Development Support etc.
43 string, you get a const pointer to the substring). Update code
44 paths that used non-const pointer to receive their results that did
45 not have to be non-const to adjust.
42 - (merge fc9fd8065c cf/c23-const-preserving-strchr-updates-0 later to maint).
46
47 * Rename three functions around the commit_list data structure.
45 - (merge 9f18d089c5 ps/commit-list-functions-renamed later to maint).
48
49 * Transaction to create objects (or not) is currently tied to the
50 repository, but in the future a repository can have multiple object
51 sources, which may have different transaction mechanisms. Make the
52 odb transaction API per object source.
51 - (merge 3f67e3d021 jt/odb-transaction-per-source later to maint).
53
54 * "git merge-ours" is taught to work better in a sparse checkout.
54 - (merge fb1b786ebf sb/merge-ours-sparse later to maint).
55 +
56 + * Allow recording process ID of the process that holds the lock next
57 + to a lockfile for diagnosis.
58 +
59 + * Reduce dependency on the_repository of xdiff-interface layer.
60 +
61 + * Code clean-up to use the commit_stack API.
62
63
64 Fixes since v2.53
@@ -90,6 +97,10 @@ Fixes since v2.53
97 "next" branch.
98 (merge c591c3ceff jc/ci-test-contrib-too later to maint).
99
100 + * A handful of documentation pages have been modernized to use the
101 + "synopsis" style.
102 + (merge a34d1d53a6 ja/doc-synopsis-style-even-more later to maint).
103 +
104 * Other code cleanup, docfix, build fix, etc.
105 (merge d79fff4a11 jk/remote-tracking-ref-leakfix later to maint).
106 (merge 7a747f972d dd/t5403-modernise later to maint).
@@ -103,3 +114,9 @@ Fixes since v2.53
114 (merge 0728012c53 jc/diff-highlight-main-master-testfix later to maint).
115 (merge 831989ef38 mc/doc-send-email-signed-off-by-cc later to maint).
116 (merge c44b3f3203 sd/doc-my1c-api-config-reference-fix later to maint).
117 + (merge 6c21e53bad rs/version-wo-the-repository later to maint).
118 + (merge 10c68d2577 rs/clean-includes later to maint).
119 + (merge 168d575719 bk/t2003-modernise later to maint).
120 + (merge 6bfef81c9a kh/doc-rerere-options-xref later to maint).
121 + (merge aaf3cc3d8d sd/t7003-test-path-is-helpers later to maint).
122 + (merge 2668b6bdc4 jc/doc-rerere-update later to maint).