diff options
author | Richard Hansen <rhansen@bbn.com> | 2013-09-04 15:04:28 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 15:02:25 -0700 |
commit | 36a2a54dbf49b74519f6af1a672c9232e450f5f1 (patch) | |
tree | e4678d1028b8048a0dc26b20f7d24cb8f430fc68 /Documentation/glossary-content.txt | |
parent | e230c568c4b9a991e3175e5f65171a566fd8e39c (diff) | |
download | git-36a2a54dbf49b74519f6af1a672c9232e450f5f1.tar.gz |
glossary: mention 'treeish' as an alternative to 'tree-ish'
The documentation contains a mix of the two spellings, so include both
in the glossary so that a search for either will lead to the
definition.
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/glossary-content.txt')
-rw-r--r-- | Documentation/glossary-content.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index dba5062b37..0273095eb4 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -486,7 +486,7 @@ should not be combined with other pathspec. with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>. -[[def_tree-ish]]tree-ish:: +[[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. |