The 3rd batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 17, 2026 at 22:57 UTC
68aca6b91299738150f71035d0033af6987fe455
1 file changed
+28
-7
Documentation/RelNotes/2.55.0.adoc
+28
-7
@@ -14,6 +14,13 @@ UI, Workflows & Features
14
to a remote repository are mostly disabled by default, except for
15
ANSI color escape sequences.
16
17
+ * "ort" merge backend improvements.
18
+
19
+ * "git checkout -m another-branch" was invented to deal with local
20
+ changes to paths that are different between the current and the new
21
+ branch, but it gave only one chance to resolve conflicts. The command
22
+ was taught to create a stash to save the local changes.
23
+
24
25
Performance, Internal Implementation, Development Support etc.
26
--------------------------------------------------------------
@@ -45,10 +52,6 @@ Fixes since v2.54
52
* Revert a recent change that introduced a regression to help mksh users.
53
(merge 8b44deebaf jk/revert-aa-reap-transport-child-processes later to maint).
54
48
- * Other code cleanup, docfix, build fix, etc.
49
- (merge 80f4b802e9 ja/doc-difftool-synopsis-style later to maint).
50
- (merge b96490241e jc/doc-timestamps-in-stat later to maint).
51
-
55
* Update various GitHub Actions versions.
56
(merge 4a6ed9d09f js/ci-github-actions-update later to maint).
57
@@ -56,9 +59,27 @@ Fixes since v2.54
59
test..
60
(merge b33bea27a2 js/t5564-socks-use-short-path later to maint).
61
59
- * Test fix.
60
- (merge 66ae1a48ec jc/t5551-fix-expensive later to maint).
61
-
62
* To help Windows 10 installations, avoid removing files whose
63
contents are still mmap()'ed.
64
(merge 4bb086cfa2 js/maintenance-fix-deadlock-on-win10 later to maint).
65
+
66
+ * The 'git backfill' command now rejects revision-limiting options that
67
+ are incompatible with its operation, uses standard documentation for
68
+ revision ranges, and includes blobs from boundary commits by default
69
+ to improve performance of subsequent operations.
70
+ (merge a1ad4a0fca en/backfill-fixes-and-edges later to maint).
71
+
72
+ * "git grep" update.
73
+ (merge 9ff4b5ab1b rs/grep-column-only-match-fix later to maint).
74
+
75
+ * Headers from glibc 2.43 when used with clang does not allow
76
+ disabling C11 language features, causing build failures..
77
+ (merge 0a6d29090c ps/clang-w-glibc-2.43-and-_Generic later to maint).
78
+
79
+ * Other code cleanup, docfix, build fix, etc.
80
+ (merge 80f4b802e9 ja/doc-difftool-synopsis-style later to maint).
81
+ (merge b96490241e jc/doc-timestamps-in-stat later to maint).
82
+ (merge 66ae1a48ec jc/t5551-fix-expensive later to maint).
83
+ (merge ef85286e51 ss/t7004-unhide-git-failures later to maint).
84
+ (merge 7584d10bc2 mf/format-patch-cover-letter-format-docfix later to maint).
85
+ (merge 8547908eb3 pw/rename-to-get-current-worktree later to maint).