Merge branch 'di/readme-markup-fix' into maint

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index d7fb770cf5de6729f7fb973903183132139f79ac..8d38ae6010866a157dfdb7d52b58605d1cd2f3b6 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -413,6 +413,8 @@ these forms:
 - "`!ATTR`" requires that the attribute `ATTR` be
   unspecified.
 +
+Note that when matching against a tree object, attributes are still
+obtained from working tree, not from the given tree object.
 
 exclude;;
        After a path matches any non-exclude pathspec, it will be run