From: Junio C Hamano <junkio@cox.net>
Date: Thu, 3 Nov 2005 21:52:44 +0000 (-0800)
Subject: Illustration: "Commit DAG Revision Naming"
X-Git-Tag: v0.99.9c^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2be8fd085e865097fa0908fe1a94c8edf9cde7f5;p=git.git

Illustration: "Commit DAG Revision Naming"

Jon Loeliger's ASCII art in the git-rev-parse(1) manual.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index dfe21391..431b8f6e 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -132,6 +132,32 @@ which is passed to 'git-rev-list'.  Two revision parameters
 concatenated with '..' is a short-hand for writing a range
 between them.  I.e. 'r1..r2' is equivalent to saying '{caret}r1 r2'
 
+Here is an illustration, by Jon Loeliger.  Both node B and C are
+a commit parents of commit node A.  Parent commits are ordered
+left-to-right.
+
+    G   H   I   J
+     \ /     \ /
+      D   E   F
+       \  |  /
+        \ | /
+         \|/
+          B     C
+           \   /
+            \ /
+             A
+
+    A =      = A^0
+    B = A^   = A^1     = A~1
+    C = A^2  = A^2
+    D = A^^  = A^1^1   = A~2
+    E = B^2  = A^^2
+    F = B^3  = A^^3
+    G = A^^^ = A^1^1^1 = A~3
+    H = D^2  = B^^2    = A^^^2  = A~2^2
+    I = F^   = B^3^    = A^^3^
+    J = F^2  = B^3^2   = A^^3^2
+
 
 Author
 ------