Update RelNotes to 2.6 to describe leftover bits since -rc2

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

diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt
index 7d65c163da061901d1596bc0703f13e780a13f6e..438cb60535ad3f5cc6ab7d615587217a02a96f19 100644 (file)
--- 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.
 
  * 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.
 
  * 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).
 
    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).
  * Code cleanups and documentation updates.
    (merge 1c601af es/doc-clean-outdated-tools later to maint).
    (merge 3581304 kn/tag-doc-fix later to maint).