Autogenerated HTML docs for v1.7.2-rc1

1 files changed, 10 insertions, 7 deletions

diff --git a/git-rev-parse.html b/git-rev-parse.html
index 92b43925e..8f227fa6b 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -777,7 +777,7 @@ The suffix <em>@{upstream}</em> to a ref (short form <em>ref@{u}</em>) refers to
 </li>

 <li>

 <p>

-A suffix <em>&#94;</em> to a revision parameter means the first parent of

+A suffix <em>&#94;</em> to a revision parameter (e.g. <em>HEAD&#94;</em>) means the first parent of

   that commit object.  <em>&#94;&lt;n&gt;</em> means the &lt;n&gt;th parent (i.e.

   <em>rev&#94;</em>

   is equivalent to <em>rev&#94;1</em>).  As a special rule,

@@ -815,7 +815,7 @@ A suffix <em>&#94;</em> followed by an empty brace pair
 </li>

 <li>

 <p>

-A colon, followed by a slash, followed by a text: this names

+A colon, followed by a slash, followed by a text (e.g. <tt>:/fix nasty bug</tt>): this names

   a commit whose commit message starts with the specified text.

   This name returns the youngest matching commit which is

   reachable from any ref.  If the commit message starts with a

@@ -825,17 +825,20 @@ A colon, followed by a slash, followed by a text: this names
 </li>

 <li>

 <p>

-A suffix <em>:</em> followed by a path; this names the blob or tree

+A suffix <em>:</em> followed by a path (e.g. <tt>HEAD:README</tt>); this names the blob or tree

   at the given path in the tree-ish object named by the part

   before the colon.

+  <em>:path</em> (with an empty part before the colon, e.g. <tt>:README</tt>)

+  is a special case of the syntax described next: content

+  recorded in the index at the given path.

 </p>

 </li>

 <li>

 <p>

 A colon, optionally followed by a stage number (0 to 3) and a

-  colon, followed by a path; this names a blob object in the

-  index at the given path.  Missing stage number (and the colon

-  that follows it) names a stage 0 entry. During a merge, stage

+  colon, followed by a path (e.g. <tt>:0:README</tt>); this names a blob object in the

+  index at the given path. Missing stage number (and the colon

+  that follows it, e.g. <tt>:README</tt>) names a stage 0 entry. During a merge, stage

   1 is the common ancestor, stage 2 is the target branch's version

   (typically the current branch), and stage 3 is the version from

   the branch being merged.

@@ -1069,7 +1072,7 @@ Junio C Hamano &lt;gitster@pobox.com&gt; and Pierre Habouzit &lt;madcoder@debian
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-04-24 02:56:07 UTC

+Last updated 2010-07-01 00:08:21 UTC

 </div>

 </div>

 </body>