Autogenerated HTML docs for v1.8.2.1-538-gad776

1 files changed, 22 insertions, 61 deletions

diff --git a/gitglossary.html b/gitglossary.html
index 96d086f33..c1fe168d0 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -950,14 +950,6 @@ current branch integrates with) obviously do not work, as there is no
 (real) current branch to ask about in this state.</p></div>

 </dd>

 <dt class="hdlist1">

-<a id="def_dircache"></a>dircache

-</dt>

-<dd>

-<p>

-        You are <strong>waaaaay</strong> behind. See <a href="#def_index">index</a>.

-</p>

-</dd>

-<dt class="hdlist1">

 <a id="def_directory"></a>directory

 </dt>

 <dd>

@@ -976,16 +968,6 @@ current branch integrates with) obviously do not work, as there is no
 </p>

 </dd>

 <dt class="hdlist1">

-<a id="def_ent"></a>ent

-</dt>

-<dd>

-<p>

-        Favorite synonym to "<a href="#def_tree-ish">tree-ish</a>" by some total geeks. See

-        <a href="http://en.wikipedia.org/wiki/Ent_(Middle-earth">http://en.wikipedia.org/wiki/Ent_(Middle-earth</a>) for an in-depth

-        explanation. Avoid this term, not to confuse people.

-</p>

-</dd>

-<dt class="hdlist1">

 <a id="def_evil_merge"></a>evil merge

 </dt>

 <dd>

@@ -1065,7 +1047,7 @@ current branch integrates with) obviously do not work, as there is no
 </dt>

 <dd>

 <p>

-        In Git&#8217;s context, synonym to <a href="#def_object_name">object name</a>.

+        In Git&#8217;s context, synonym for <a href="#def_object_name">object name</a>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1180,7 +1162,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 <dd>

 <p>

         The unit of storage in Git. It is uniquely identified by the

-        <a href="#def_SHA1">SHA1</a> of its contents. Consequently, an

+        <a href="#def_SHA1">SHA-1</a> of its contents. Consequently, an

         object can not be changed.

 </p>

 </dd>

@@ -1207,10 +1189,9 @@ This commit is referred to as a "merge commit", or sometimes just a
 </dt>

 <dd>

 <p>

-        The unique identifier of an <a href="#def_object">object</a>. The <a href="#def_hash">hash</a>

-        of the object&#8217;s contents using the Secure Hash Algorithm

-        1 and usually represented by the 40 character hexadecimal encoding of

-        the <a href="#def_hash">hash</a> of the object.

+        The unique identifier of an <a href="#def_object">object</a>.  The

+        object name is usually represented by a 40 character

+        hexadecimal string.  Also colloquially called <a href="#def_SHA1">SHA-1</a>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1229,8 +1210,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 </dt>

 <dd>

 <p>

-        To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>. Also denotes an

-        intelligent predator.

+        To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1270,7 +1250,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 </dt>

 <dd>

 <p>

-       Pattern used to specify paths.

+        Pattern used to limit paths in Git commands.

 </p>

 <div class="paragraph"><p>Pathspecs are used on the command line of "git ls-files", "git

 ls-tree", "git add", "git grep", "git diff", "git checkout",

@@ -1279,6 +1259,8 @@ limit the scope of operations to some subset of the tree or
 worktree.  See the documentation of each command for whether

 paths are relative to the current directory or toplevel.  The

 pathspec syntax is as follows:</p></div>

+<div class="openblock">

+<div class="content">

 <div class="ulist"><ul>

 <li>

 <p>

@@ -1299,11 +1281,12 @@ the rest of the pathspec is a pattern for the remainder
   prefix will be matched against that pattern using fnmatch(3);

   in particular, <em>*</em> and <em>?</em> <em>can</em> match directory separators.

 </p>

+</li>

+</ul></div>

+</div></div>

 <div class="paragraph"><p>For example, Documentation/*.jpg will match all .jpg files

 in the Documentation subtree,

 including Documentation/chapter_1/figure_1.jpg.</p></div>

-</li>

-</ul></div>

 <div class="paragraph"><p>A pathspec that begins with a colon <code>:</code> has special meaning.  In the

 short form, the leading colon <code>:</code> is followed by zero or more "magic

 signature" letters (which optionally is terminated by another colon <code>:</code>),

@@ -1316,25 +1299,10 @@ parenthesis <code>(</code>, a comma-separated list of zero or more "magic words"
 and a close parentheses <code>)</code>, and the remainder is the pattern to match

 against the path.</p></div>

 <div class="paragraph"><p>The "magic signature" consists of an ASCII symbol that is not

-alphanumeric.</p></div>

-<div class="openblock">

-<div class="content">

-<div class="dlist"><dl>

-<dt class="hdlist1">

-top <code>/</code>

-</dt>

-<dd>

-<p>

-        The magic word <code>top</code> (mnemonic: <code>/</code>) makes the pattern match

-        from the root of the working tree, even when you are running

-        the command from inside a subdirectory.

-</p>

-</dd>

-</dl></div>

-</div></div>

-<div class="paragraph"><p>Currently only the slash <code>/</code> is recognized as the "magic signature",

-but it is envisioned that we will support more types of magic in later

-versions of Git.</p></div>

+alphanumeric. Currently only the slash <code>/</code> is recognized as a

+"magic signature": it makes the pattern match from the root of

+the working tree, even when you are running the command from

+inside a subdirectory.</p></div>

 <div class="paragraph"><p>A pathspec with only a colon means "there is no pathspec". This form

 should not be combined with other pathspec.</p></div>

 </dd>

@@ -1435,7 +1403,7 @@ should not be combined with other pathspec.</p></div>
 </dt>

 <dd>

 <p>

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

+        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.

@@ -1459,15 +1427,7 @@ should not be combined with other pathspec.</p></div>
 <p>

         A "refspec" is used by <a href="#def_fetch">fetch</a> and

         <a href="#def_push">push</a> to describe the mapping between remote

-        <a href="#def_ref">ref</a> and local ref. They are combined with a colon in

-        the format &lt;src&gt;:&lt;dst&gt;, preceded by an optional plus sign, +.

-        For example: <code>git fetch $URL

-        refs/heads/master:refs/heads/origin</code> means "grab the master

-        <a href="#def_branch">branch</a> <a href="#def_head">head</a> from the $URL and store

-        it as my origin branch head". And <code>git push

-        $URL refs/heads/master:refs/heads/to-upstream</code> means "publish my

-        master branch head as to-upstream branch at $URL". See also

-        <a href="git-push.html">git-push(1)</a>.

+        <a href="#def_ref">ref</a> and local ref.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1533,11 +1493,12 @@ should not be combined with other pathspec.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

-<a id="def_SHA1"></a>SHA1

+<a id="def_SHA1"></a>SHA-1

 </dt>

 <dd>

 <p>

-        Synonym for <a href="#def_object_name">object name</a>.

+        "Secure Hash Algorithm 1"; a cryptographic hash function.

+        In the context of Git used as a synonym for <a href="#def_object_name">object name</a>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1560,7 +1521,7 @@ should not be combined with other pathspec.</p></div>
 </dt>

 <dd>

 <p>

-        Symbolic reference: instead of containing the <a href="#def_SHA1">SHA1</a>

+        Symbolic reference: instead of containing the <a href="#def_SHA1">SHA-1</a>

         id itself, it is of the format <em>ref: refs/some/thing</em> and when

         referenced, it recursively dereferences to this reference.

         <em><a href="#def_HEAD">HEAD</a></em> is a prime example of a symref. Symbolic