From: Richard Hansen <rhansen@bbn.com>
Date: Mon, 02 Sep 2013 05:34:24 GMT
Subject: [PATCH v2 5/7] glossary: more precise definition of treeish (a.k.a. tree-ish)
Message-ID: <1378100066-31889-6-git-send-email-rhansen@bbn.com>
In-Reply-To: <1378100066-31889-1-git-send-email-rhansen@bbn.com>

A treeish isn't a ref.  Also, mention dereferencing, and that a commit
dereferences to a tree, to support gitrevisions(7) and rev-parse's
error messages.

Signed-off-by: Richard Hansen <rhansen@bbn.com>
---
 Documentation/glossary-content.txt | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 257a7fe..a2edcc3 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -499,9 +499,18 @@ should not be combined with other pathspec.
 	<<def_tree,tree>> is equivalent to a <<def_directory,directory>>.
 
 [[def_treeish]]treeish (also tree-ish)::
-	A <<def_ref,ref>> pointing to either a <<def_commit_object,commit
-	object>>, a <<def_tree_object,tree object>>, or a <<def_tag_object,tag
-	object>> pointing to a tag or commit or tree object.
+	A <<def_tree_object,tree object>> or an <<def_object,object>>
+	that can be recursively dereferenced to a tree object.
+	Dereferencing a <<def_commit_object,commit object>> yields the
+	tree object corresponding to the <<def_revision,revision>>'s
+	top <<def_directory,directory>>.
+	The following are all treeishes:
+	a <<def_committish,committish>>,
+	a tree object,
+	a <<def_tag_object,tag object>> 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 <<def_index,index>> which contains unmerged
-- 
1.8.4