Autogenerated HTML docs for v1.5.6.2-276-gbb29

1 files changed, 15 insertions, 6 deletions

diff --git a/git-rev-parse.html b/git-rev-parse.html
index fe70a422f..9b3229b17 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -631,7 +631,7 @@ A symbolic ref name.  E.g. <em>master</em> typically means the commit
 <li>

 <p>

 if <tt>$GIT_DIR/&lt;name&gt;</tt> exists, that is what you mean (this is usually

-    useful only for <tt>HEAD</tt>, <tt>FETCH_HEAD</tt> and <tt>MERGE_HEAD</tt>);

+    useful only for <tt>HEAD</tt>, <tt>FETCH_HEAD</tt>, <tt>ORIG_HEAD</tt> and <tt>MERGE_HEAD</tt>);

 </p>

 </li>

 <li>

@@ -658,6 +658,15 @@ otherwise, <tt>$GIT_DIR/refs/remotes/&lt;name&gt;</tt> if exists;
 <p>

 otherwise, <tt>$GIT_DIR/refs/remotes/&lt;name&gt;/HEAD</tt> if exists.

 </p>

+<div class="para"><p>HEAD names the commit your changes in the working tree is based on.

+FETCH_HEAD records the branch you fetched from a remote repository

+with your last <em>git-fetch</em> invocation.

+ORIG_HEAD is created by commands that moves your HEAD in a drastic

+way, to record the position of the HEAD before their operation, so that

+you can change the tip of the branch back to the state before you ran

+them easily.

+MERGE_HEAD records the commit(s) you are merging into your branch

+when you run <em>git-merge</em>.</p></div>

 </li>

 </ol></div>

 </li>

@@ -801,10 +810,10 @@ commit, following the commit ancestry chain.</p></div>
 notation is used.  E.g. "<tt>&#94;r1 r2</tt>" means commits reachable

 from <tt>r2</tt> but exclude the ones reachable from <tt>r1</tt>.</p></div>

 <div class="para"><p>This set operation appears so often that there is a shorthand

-for it.  "<tt>r1..r2</tt>" is equivalent to "<tt>&#94;r1 r2</tt>".  It is

-the difference of two sets (subtract the set of commits

-reachable from <tt>r1</tt> from the set of commits reachable from

-<tt>r2</tt>).</p></div>

+for it.  When you have two commits <tt>r1</tt> and <tt>r2</tt> (named according

+to the syntax explained in SPECIFYING REVISIONS above), you can ask

+for commits that are reachable from r2 excluding those that are reachable

+from r1 by "<tt>&#94;r1 r2</tt>" and it can be written as "<tt>r1..r2</tt>".</p></div>

 <div class="para"><p>A similar notation "<tt>r1...r2</tt>" is called symmetric difference

 of <tt>r1</tt> and <tt>r2</tt> and is defined as

 "<tt>r1 r2 --not $(git merge-base --all r1 r2)</tt>".

@@ -964,7 +973,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Pierre Habouzit &lt;madcoder@debian.or
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-07-07 22:10:11 UTC

+Last updated 2008-07-09 19:53:03 UTC

 </div>

 </div>

 </body>