summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-14 15:00:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-14 15:00:41 -0700
commitf4d9753a89bf04011c00e943d85211906e86a0f6 (patch)
tree5dbb1070af15973bb98d16ad4775c577e655bd6a
parentMerge branch 'js/maint-am-skip-performance-regression' (diff)
downloadtgif-f4d9753a89bf04011c00e943d85211906e86a0f6.tar.xz
Update RelNotes to 2.6 to describe leftover bits since -rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.6.0.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt
index 7d65c163da..438cb60535 100644
--- a/Documentation/RelNotes/2.6.0.txt
+++ b/Documentation/RelNotes/2.6.0.txt
@@ -275,7 +275,7 @@ notes for details).
* We rewrote one of the build scripts in Perl but this reimplements
in Bourne shell.
- (merge 82aec45 sg/help-group later to maint).
+ (merge 57cee8a sg/help-group later to maint).
* The experimental untracked-cache feature were buggy when paths with
a few levels of subdirectories are involved.
@@ -333,6 +333,12 @@ notes for details).
which was found to be a bit confusing to new users.
(merge ce11360 jk/log-missing-default-HEAD later to maint).
+ * Recent versions of scripted "git am" has a performance regression in
+ "git am --skip" codepath, which no longer exists in the built-in
+ version on the 'master' front. Fix the regression in the last
+ scripted version that appear in 2.5.x maintenance track and older.
+ (merge b9d6689 js/maint-am-skip-performance-regression later to maint).
+
* Code cleanups and documentation updates.
(merge 1c601af es/doc-clean-outdated-tools later to maint).
(merge 3581304 kn/tag-doc-fix later to maint).