summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:28 (GMT)
commitd6f05a435f9c89f8c9860c7af692942768d81584 (patch)
tree7b43bdb292f9cda801778647a67ddc2662504067 /Documentation
parentc333fe73682b182d6872f9e5b454c2899c6203ab (diff)
parent5a0b97b34c51eaddf39624857f1ac0e7df4ca2e3 (diff)
downloadgit-d6f05a435f9c89f8c9860c7af692942768d81584.zip
git-d6f05a435f9c89f8c9860c7af692942768d81584.tar.gz
git-d6f05a435f9c89f8c9860c7af692942768d81584.tar.bz2
Merge branch 'nd/attr-pathspec-in-tree-walk'
The traversal over tree objects has learned to honor ":(attr:label)" pathspec match, which has been implemented only for enumerating paths on the filesystem. * nd/attr-pathspec-in-tree-walk: tree-walk: support :(attr) matching dir.c: move, rename and export match_attrs() pathspec.h: clean up "extern" in function declarations tree-walk.c: make tree_entry_interesting() take an index tree.c: make read_tree*() take 'struct repository *'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/glossary-content.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 0d2aa48..023ca95 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -404,6 +404,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