mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 08:16:19 +02:00
Code

glossary: more precise definition of tree-ish (a.k.a. treeish) 

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>
This commit is contained in:
Richard Hansen 2013-09-04 15:04:32 -04:00 committed by Junio C Hamano
parent a8a5406ab3
commit 930f302cdb
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/glossary-content.txt
View File

@ -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