summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-12 15:25:14 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-12 15:25:14 -0700
commit80145b1e412719c960036c8c62a9e35dd23a5b2d (patch)
tree5ab9d43847eab0984ae7bd7a78a38a1c64feb149
parent8ba1d6616fa5ebc46c3f70139a549c672348e1aa (diff)
parent08f9c32463bf9e578acb7ac5f77afd36e803c6bc (diff)
downloadgit-80145b1e412719c960036c8c62a9e35dd23a5b2d.tar.gz
Sync with v2.13.3
-rw-r--r--Documentation/RelNotes/2.13.3.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.13.3.txt b/Documentation/RelNotes/2.13.3.txt
index 44d9108ce4..5d76ad5310 100644
--- a/Documentation/RelNotes/2.13.3.txt
+++ b/Documentation/RelNotes/2.13.3.txt
@@ -50,4 +50,13 @@ Fixes since v2.13.2
did not use 'git rev-parse' to formulate the line to look for in
the certificate correctly.
+ * After "git branch --move" of the currently checked out branch, the
+ code to walk the reflog of HEAD via "log -g" and friends
+ incorrectly stopped at the reflog entry that records the renaming
+ of the branch.
+
+ * The rewrite of "git branch --list" using for-each-ref's internals
+ that happened in v2.13 regressed its handling of color.branch.local;
+ this has been fixed.
+
Also contains various documentation updates and code clean-ups.