Skip to content

Commit 2f26889

Browse files
committed
The eighth batch for 2.26
Signed-off-by: Junio C Hamano <[email protected]>
1 parent aa5a7e0 commit 2f26889

File tree

1 file changed

+37
-0
lines changed

1 file changed

+37
-0
lines changed

Documentation/RelNotes/2.26.0.txt

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,19 @@ Performance, Internal Implementation, Development Support etc.
9595
* Memory footprint and performance of "git name-rev" has been
9696
improved.
9797

98+
* The object reachability bitmap machinery and the partial cloning
99+
machinery were not prepared to work well together, because some
100+
object-filtering criteria that partial clones use inherently rely
101+
on object traversal, but the bitmap machinery is an optimization
102+
to bypass that object traversal. There however are some cases
103+
where they can work together, and they were taught about them.
104+
105+
* "git rebase" has learned to use the merge backend (i.e. the
106+
machinery that drives "rebase -i") by default, while allowing
107+
"--apply" option to use the "apply" backend (e.g. the moral
108+
equivalent of "format-patch piped to am"). The rebase.backend
109+
configuration variable can be set to customize.
110+
98111

99112
Fixes since v2.25
100113
-----------------
@@ -219,6 +232,25 @@ Fixes since v2.25
219232
(e.g. branch.<name>.remote) whose value used to be X to Y.
220233
branch.<name>.pushRemote is now also updated.
221234

235+
* Update to doc-diff.
236+
(merge 2607d39da3 jk/doc-diff-parallel later to maint).
237+
238+
* Doc markup fix.
239+
(merge 0aa6ce3094 jk/push-option-doc-markup-fix later to maint).
240+
241+
* "git check-ignore" did not work when the given path is explicitly
242+
marked as not ignored with a negative entry in the .gitignore file.
243+
(merge 7ec8125fba en/check-ignore later to maint).
244+
245+
* The merge-recursive machinery failed to refresh the cache entry for
246+
a merge result in a couple of places, resulting in an unnecessary
247+
merge failure, which has been fixed.
248+
(merge fb1c18fc46 en/t3433-rebase-stat-dirty-failure later to maint).
249+
250+
* Fix for a bug revealed by a recent change to make the protocol v2
251+
the default.
252+
(merge 3e96c66805 ds/partial-clone-fixes later to maint).
253+
222254
* Other code cleanup, docfix, build fix, etc.
223255
(merge 26f924d50e en/simplify-check-updates-in-unpack-trees later to maint).
224256
(merge d0d0a357a1 am/update-pathspec-f-f-tests later to maint).
@@ -238,3 +270,8 @@ Fixes since v2.25
238270
(merge cc4f2eb828 jk/doc-credential-helper later to maint).
239271
(merge e0020b2f82 es/outside-repo-errmsg-hints later to maint).
240272
(merge a2dc43414c es/doc-mentoring later to maint).
273+
(merge 539052f42f jk/run-command-formatfix later to maint).
274+
(merge 02bbbe9df9 es/worktree-cleanup later to maint).
275+
(merge 2ce6d075fa rs/micro-cleanups later to maint).
276+
(merge 27f182b3fc rs/blame-typefix-for-fingerprint later to maint).
277+
(merge 3c29e21eb0 ma/test-cleanup later to maint).

0 commit comments

Comments
 (0)