Autogenerated HTML docs for v1.5.6-rc0-29-g3beb5

diff --git a/git-diff-files.html b/git-diff-files.html
index f749733f9bb0f95dddc2df54da81f5ff324b8f12..de0f0f9698904faf6c70028c43f917b7c4b5b64e 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -272,7 +272,7 @@ git-diff-files(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [&lt;common diff options&gt;] [&lt;path&gt;&#8230;]</p>\r
+<p><em>git-diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [&lt;common diff options&gt;] [&lt;path&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -784,14 +784,6 @@ omit diff output for unmerged entries and just show "Unmerged".</p>
 </p>\r
 </dd>\r
 <dt>\r
---no-index\r
-</dt>\r
-<dd>\r
-<p>\r
-        Compare the two given files / directories.\r
-</p>\r
-</dd>\r
-<dt>\r
 -q\r
 </dt>\r
 <dd>\r
@@ -1296,7 +1288,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-May-2008 01:14:45 UTC\r
+Last updated 27-May-2008 07:44:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-files.txt b/git-diff-files.txt
index 6d2ea16a25989eaf2fa6cc219bca212251498ed3..ca1bb6a8ee9ccb6ffa5a01c7e13af7c8caa83cdf 100644 (file)
--- a/git-diff-files.txt
+++ b/git-diff-files.txt
@@ -8,7 +8,7 @@ git-diff-files - Compares files in the working tree and the index
 
 SYNOPSIS
 --------
-'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [<common diff options>] [<path>...]
+'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
 
 DESCRIPTION
 -----------
@@ -36,9 +36,6 @@ omit diff output for unmerged entries and just show "Unmerged".
        diff, similar to the way 'diff-tree' shows a merge
        commit with these flags.
 
---no-index::
-       Compare the two given files / directories.
-
 -q::
        Remain silent even on nonexistent files
 

diff --git a/git-rev-parse.html b/git-rev-parse.html
index 527597bdb0ffe40aaa32c715e26a6af5b1e69a4e..b4f6a1cfedc019d25aa4bd72f44f7ba997987923 100644 (file)
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -705,7 +705,8 @@ left-to-right.</p>
 <pre><tt>G   H   I   J\r
  \ /     \ /\r
   D   E   F\r
-   \  |  /         \ | /   |\r
+   \  |  / \\r
+    \ | /   |\r
      \|/    |\r
       B     C\r
        \   /\r
@@ -900,7 +901,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Pierre Habouzit &lt;madcoder@debian.or
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 22-May-2008 00:52:47 UTC\r
+Last updated 27-May-2008 07:44:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index 69599ffb679b17ebbe6ba85c772cd10a3511d89e..5641d995180b7aed563872b2403dbd29870a2185 100644 (file)
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -243,16 +243,18 @@ Here is an illustration, by Jon Loeliger.  Both commit nodes B
 and C are parents of commit node A.  Parent commits are ordered
 left-to-right.
 
-    G   H   I   J
-     \ /     \ /
-      D   E   F
-       \  |  / \ 
-        \ | /   |
-         \|/    |
-          B     C
-           \   /
-            \ /
-             A
+........................................
+G   H   I   J
+ \ /     \ /
+  D   E   F
+   \  |  / \
+    \ | /   |
+     \|/    |
+      B     C
+       \   /
+        \ /
+         A
+........................................
 
     A =      = A^0
     B = A^   = A^1     = A~1