From 137273f2a3626d04f9370f6eb0cf964dada84136 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 27 May 2008 07:44:33 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.6-rc0-29-g3beb5 --- git-diff-files.html | 12 ++---------- git-diff-files.txt | 5 +---- git-rev-parse.html | 5 +++-- git-rev-parse.txt | 22 ++++++++++++---------- 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/git-diff-files.html b/git-diff-files.html index f749733f9..de0f0f969 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -272,7 +272,7 @@ git-diff-files(1) Manual Page

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

@@ -784,14 +784,6 @@ omit diff output for unmerged entries and just show "Unmerged".

---no-index -
-
-

- Compare the two given files / directories. -

-
-
-q
@@ -1296,7 +1288,7 @@ the pathname, but if that is NUL, the record will show two paths.

diff --git a/git-diff-files.txt b/git-diff-files.txt index 6d2ea16a2..ca1bb6a8e 100644 --- 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] [] [...] +'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [] [...] 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 527597bdb..b4f6a1cfe 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -705,7 +705,8 @@ left-to-right.

G   H   I   J
  \ /     \ /
   D   E   F
-   \  |  /         \ | /   |
+   \  |  / \
+    \ | /   |
      \|/    |
       B     C
        \   /
@@ -900,7 +901,7 @@ Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.or
 
 
 
diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index 69599ffb6..5641d9951 100644
--- 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
-- 
2.26.2