Skip to content

Commit

Permalink
glossary: more precise definition of tree-ish (a.k.a. treeish)
Browse files Browse the repository at this point in the history
A tree-ish 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Richard Hansen authored and Junio C Hamano committed Sep 4, 2013
1 parent a8a5406 commit 930f302
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions Documentation/glossary-content.txt
Original file line number Diff line number Diff line change
Expand Up @@ -499,9 +499,18 @@ should not be combined with other pathspec.
<<def_tree,tree>> is equivalent to a <<def_directory,directory>>.

[[def_tree-ish]]tree-ish (also treeish)::
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 tree-ishes:
a <<def_commit-ish,commit-ish>>,
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
Expand Down

0 comments on commit 930f302

Please sign in to comment.