summaryrefslogtreecommitdiff
path: root/Documentation/git-rev-parse.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-03 21:52:44 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-03 22:55:49 (GMT)
commit2be8fd085e865097fa0908fe1a94c8edf9cde7f5 (patch)
treefaf296a197318ad6a001a672e3b585e6fe31f37b /Documentation/git-rev-parse.txt
parent36f05ef485d023eda3bf750e7b207d07d5feb39d (diff)
downloadgit-2be8fd085e865097fa0908fe1a94c8edf9cde7f5.zip
git-2be8fd085e865097fa0908fe1a94c8edf9cde7f5.tar.gz
git-2be8fd085e865097fa0908fe1a94c8edf9cde7f5.tar.bz2
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>
Diffstat (limited to 'Documentation/git-rev-parse.txt')
-rw-r--r--Documentation/git-rev-parse.txt26
1 files changed, 26 insertions, 0 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index dfe2139..431b8f6 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
------