summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-28 04:43:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-28 04:44:21 (GMT)
commit1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff (patch)
tree49b04636554e1e849e06cc9fb6f4d75b25270b77 /Documentation
parentafc63cb6c6676a89a0549568163d4fe88093c94c (diff)
parent9b185bef0c15cec1ea8753ce091e42ea041f2c31 (diff)
downloadgit-1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff.zip
git-1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff.tar.gz
git-1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff.tar.bz2
Sync with v2.15.1
Diffstat (limited to 'Documentation')
-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.