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>
Junio C Hamano committed
Nov 3, 2005 at 13:52 UTC
2be8fd085e865097fa0908fe1a94c8edf9cde7f5
1 file changed
+26
Documentation/git-rev-parse.txt
+26
@@ -132,6 +132,32 @@ which is passed to 'git-rev-list'. Two revision parameters
132
concatenated with '..' is a short-hand for writing a range
133
between them. I.e. 'r1..r2' is equivalent to saying '{caret}r1 r2'
134
135
+Here is an illustration, by Jon Loeliger. Both node B and C are
136
+a commit parents of commit node A. Parent commits are ordered
137
+left-to-right.
138
+
139
+ G H I J
140
+ \ / \ /
141
+ D E F
142
+ \ | /
143
+ \ | /
144
+ \|/
145
+ B C
146
+ \ /
147
+ \ /
148
+ A
149
+
150
+ A = = A^0
151
+ B = A^ = A^1 = A~1
152
+ C = A^2 = A^2
153
+ D = A^^ = A^1^1 = A~2
154
+ E = B^2 = A^^2
155
+ F = B^3 = A^^3
156
+ G = A^^^ = A^1^1^1 = A~3
157
+ H = D^2 = B^^2 = A^^^2 = A~2^2
158
+ I = F^ = B^3^ = A^^3^
159
+ J = F^2 = B^3^2 = A^^3^2
160
+
161
162
Author
163
------