Autogenerated HTML docs for v1.8.4-357-g8d83

1 files changed, 42 insertions, 6 deletions

diff --git a/gitglossary.html b/gitglossary.html
index 88c5d7845..4e570f655 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -896,6 +896,23 @@ to point at the new commit.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+<a id="def_commit-ish"></a>commit-ish (also committish)

+</dt>

+<dd>

+<p>

+        A <a href="#def_commit_object">commit object</a> or an

+        <a href="#def_object">object</a> that can be recursively dereferenced to

+        a commit object.

+        The following are all commit-ishes:

+        a commit object,

+        a <a href="#def_tag_object">tag object</a> that points to a commit

+        object,

+        a tag object that points to a tag object that points to a

+        commit object,

+        etc.

+</p>

+</dd>

+<dt class="hdlist1">

 <a id="def_core_git"></a>core Git

 </dt>

 <dd>

@@ -1481,11 +1498,19 @@ should not be combined with other pathspec.</p></div>
 </dt>

 <dd>

 <p>

-        A 40-byte hex representation of a <a href="#def_SHA1">SHA-1</a> or a name that

-        denotes a particular <a href="#def_object">object</a>. They may be stored in

-        a file under <code>$GIT_DIR/refs/</code> directory, or

-        in the <code>$GIT_DIR/packed-refs</code> file.

+        A name that begins with <code>refs/</code> (e.g. <code>refs/heads/master</code>)

+        that points to an <a href="#def_object_name">object name</a> or another

+        ref (the latter is called a <a href="#def_symref">symbolic ref</a>).

+        For convenience, a ref can sometimes be abbreviated when used

+        as an argument to a Git command; see <a href="gitrevisions.html">gitrevisions(7)</a>

+        for details.

+        Refs are stored in the <a href="#def_repository">repository</a>.

 </p>

+<div class="paragraph"><p>The ref namespace is hierarchical.

+Different subhierarchies are used for different purposes (e.g. the

+<code>refs/heads/</code> hierarchy is used to represent local branches).</p></div>

+<div class="paragraph"><p>There are a few special-purpose refs that do not begin with <code>refs/</code>.

+The most notable example is <code>HEAD</code>.</p></div>

 </dd>

 <dt class="hdlist1">

 <a id="def_reflog"></a>reflog

@@ -1664,11 +1689,22 @@ should not be combined with other pathspec.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

-<a id="def_tree-ish"></a>tree-ish

+<a id="def_tree-ish"></a>tree-ish (also treeish)

 </dt>

 <dd>

 <p>

-        A <a href="#def_ref">ref</a> pointing to either a <a href="#def_commit_object">commit         object</a>, a <a href="#def_tree_object">tree object</a>, or a <a href="#def_tag_object">tag         object</a> pointing to a tag or commit or tree object.

+        A <a href="#def_tree_object">tree object</a> or an <a href="#def_object">object</a>

+        that can be recursively dereferenced to a tree object.

+        Dereferencing a <a href="#def_commit_object">commit object</a> yields the

+        tree object corresponding to the <a href="#def_revision">revision</a>'s

+        top <a href="#def_directory">directory</a>.

+        The following are all tree-ishes:

+        a <a href="#def_commit-ish">commit-ish</a>,

+        a tree object,

+        a <a href="#def_tag_object">tag object</a> that points to a tree object,

+        a tag object that points to a tag object that points to a tree

+        object,

+        etc.

 </p>

 </dd>

 <dt class="hdlist1">