summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-28 04:39:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-28 04:39:14 (GMT)
commit9b185bef0c15cec1ea8753ce091e42ea041f2c31 (patch)
tree85424e2ca75fd56c4059f33da7cca6cbd3266512
parentb201e96f94f04d6316cf8c3ce4abed8408fb0857 (diff)
downloadgit-2.15.1.zip
git-2.15.1.tar.gz
git-2.15.1.tar.bz2
Git 2.15.1v2.15.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.15.1.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt
index a6ae4c1..ec06704 100644
--- a/Documentation/RelNotes/2.15.1.txt
+++ b/Documentation/RelNotes/2.15.1.txt
@@ -82,4 +82,7 @@ Fixes since v2.15
* An ancient bug in "git apply --ignore-space-change" codepath has
been fixed.
+ * There was a recent semantic mismerge in the codepath to write out a
+ section of a configuration section, which has been corrected.
+
Also contains various documentation updates and code clean-ups.