summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-05-26 19:49:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-26 19:49:01 -0700
commit2fe18392f0355c80295b8b74b24fc817183d3752 (patch)
tree46feb2f65ad4589475ff946bb34b8abd4a5a928d /Documentation
parentMerge git://repo.or.cz/git-gui (diff)
parentMerge branch 'gp/bisect-fix' into maint (diff)
downloadtgif-2fe18392f0355c80295b8b74b24fc817183d3752.tar.xz
Merge branch 'maint'
* maint: Documentation: fix graph in git-rev-parse.txt show-branch --current: do not barf on detached HEAD
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rev-parse.txt22
1 files changed, 12 insertions, 10 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 69599ffb67..5641d99518 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/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