diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 47e901ece..3466ce912 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -499,9 +499,18 @@ should not be combined with other pathspec. <> is equivalent to a <>. [[def_tree-ish]]tree-ish (also treeish):: - A <> pointing to either a <>, a <>, or a <> pointing to a tag or commit or tree object. + A <> or an <> + that can be recursively dereferenced to a tree object. + Dereferencing a <> yields the + tree object corresponding to the <>'s + top <>. + The following are all tree-ishes: + a <>, + a tree object, + a <> that points to a tree object, + a tag object that points to a tag object that points to a tree + object, + etc. [[def_unmerged_index]]unmerged index:: An <> which contains unmerged