Preparing for rc2 continues

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

diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.txt
index a94cf6737d4299e2945383ca264ef98c708177c0..1267c3f89964261e3234951ef98d24f6cc10ff74 100644 (file)
--- a/Documentation/RelNotes/2.15.0.txt
+++ b/Documentation/RelNotes/2.15.0.txt
@@ -483,9 +483,8 @@ Fixes since v2.14
  * Users with "color.ui = always" in their configuration were broken
    by a recent change that made plumbing commands to pay attention to
    them as the patch created internally by "git add -p" were colored
  * Users with "color.ui = always" in their configuration were broken
    by a recent change that made plumbing commands to pay attention to
    them as the patch created internally by "git add -p" were colored

-   (heh) and made unusable.  Fix this regression by redefining
-   'always' to mean the same thing as 'auto'.
-   (merge 6be4595edb jk/ui-color-always-to-auto-maint later to maint).
+   (heh) and made unusable.  This has been fixed by reverting the
+   offending change.

 
  * In the "--format=..." option of the "git for-each-ref" command (and
    its friends, i.e. the listing mode of "git branch/tag"), "%(atom:)"
 
  * In the "--format=..." option of the "git for-each-ref" command (and
    its friends, i.e. the listing mode of "git branch/tag"), "%(atom:)"