Merge branch 'fc/do-not-use-the-index-in-add-to-index'

diff --git a/Documentation/RelNotes/1.8.1.6.txt b/Documentation/RelNotes/1.8.1.6.txt
index d9de6390809b476d3ee191b8f77fea450337f18f..c15cf2e80545bbcf1556209bbb078688a544e732 100644 (file)
--- a/Documentation/RelNotes/1.8.1.6.txt
+++ b/Documentation/RelNotes/1.8.1.6.txt
@@ -4,6 +4,11 @@ Git 1.8.1.6 Release Notes
 Fixes since v1.8.1.5
 --------------------
 
+ * An earlier change to the attribute system introduced at v1.8.1.2 by
+   mistake stopped a pattern "dir" (without trailing slash) from
+   matching a directory "dir" (it only wanted to allow pattern "dir/"
+   to also match).
+
  * The code to keep track of what directory names are known to Git on
    platforms with case insensitive filesystems can get confused upon a
    hash collision between these pathnames and looped forever.