Merge branch 'ew/for-each-ref-doc'

diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt
index 7d65c163da061901d1596bc0703f13e780a13f6e..7288aaf7167946aa5dc4a4c0f2ffcb34ad09302d 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.
-   (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,16 @@ 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).
+
+ * The branch descriptions that are set with "git branch --edit-description"
+   option were used in many places but they weren't clearly documented.
+   (merge 561d2b7 po/doc-branch-desc 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).
@@ -357,3 +367,4 @@ notes for details).
    (merge 1733ed3 ee/clean-test-fixes later to maint).
    (merge 5fcadc3 gb/apply-comment-typofix later to maint).
    (merge b894d3e mp/t7060-diff-index-test later to maint).
+   (merge d238710 as/config-doc-markup-fix later to maint).