Preparing for rc2 continues

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2017-10-18 10:27:06 +09:00
parent 1c0b983a77
commit 25baa8ef90
1 changed files with 2 additions and 3 deletions

View File

@ -483,9 +483,8 @@ Fixes since v2.14
* Users with "color.ui = always" in their configuration were broken * Users with "color.ui = always" in their configuration were broken
by a recent change that made plumbing commands to pay attention to by a recent change that made plumbing commands to pay attention to
them as the patch created internally by "git add -p" were colored them as the patch created internally by "git add -p" were colored
(heh) and made unusable. Fix this regression by redefining (heh) and made unusable. This has been fixed by reverting the
'always' to mean the same thing as 'auto'. offending change.
(merge 6be4595edb jk/ui-color-always-to-auto-maint later to maint).


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