Skip to content

Commit f4d9753

Browse files
committed
Update RelNotes to 2.6 to describe leftover bits since -rc2
Signed-off-by: Junio C Hamano <[email protected]>
1 parent cf2094c commit f4d9753

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Documentation/RelNotes/2.6.0.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ notes for details).
275275

276276
* We rewrote one of the build scripts in Perl but this reimplements
277277
in Bourne shell.
278-
(merge 82aec45 sg/help-group later to maint).
278+
(merge 57cee8a sg/help-group later to maint).
279279

280280
* The experimental untracked-cache feature were buggy when paths with
281281
a few levels of subdirectories are involved.
@@ -333,6 +333,12 @@ notes for details).
333333
which was found to be a bit confusing to new users.
334334
(merge ce11360 jk/log-missing-default-HEAD later to maint).
335335

336+
* Recent versions of scripted "git am" has a performance regression in
337+
"git am --skip" codepath, which no longer exists in the built-in
338+
version on the 'master' front. Fix the regression in the last
339+
scripted version that appear in 2.5.x maintenance track and older.
340+
(merge b9d6689 js/maint-am-skip-performance-regression later to maint).
341+
336342
* Code cleanups and documentation updates.
337343
(merge 1c601af es/doc-clean-outdated-tools later to maint).
338344
(merge 3581304 kn/tag-doc-fix later to maint).

0 commit comments

Comments
 (0)