aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2007-03-29 06:42:44 +0000
committerJunio C Hamano <junkio@cox.net>2007-03-29 01:38:28 -0700
commitc2c6d9302a98ae4c4c76822a1c83551c039271a0 (patch)
treedfa55cde4bdfd246d6d089f407edc1fe0534cf02 /Documentation
parent3e63e0df4f1a1610782e679be56ea75f820343fc (diff)
downloadgit-c2c6d9302a98ae4c4c76822a1c83551c039271a0.tar.gz
git-c2c6d9302a98ae4c4c76822a1c83551c039271a0.tar.xz
Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
Please see http://bugs.debian.org/404795: In git-rev-parse(1), there is an example commit tree, which is used twice. The explanation for this tree is very clear: B and C are commit *parents* to A. However, when the tree is reused as an example in the SPECIFYING RANGES, the manpage author screws up and uses A as a commit *parent* to B and C! I.e., he inverts the tree. And the fact that for this example you need to read the tree backwards is not explained anywhere (and it would be confusing even if it was). Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rev-parse.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 4041a1607..d0a2ad308 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -258,14 +258,14 @@ its all parents.
Here are a handful examples:
- D A B D
- D F A B C D F
- ^A G B D
- ^A F B C F
- G...I C D F G I
- ^B G I C D F G I
- F^@ A B C
- F^! H D F H
+ D G H D
+ D F G H I J D F
+ ^G D H D
+ ^D B E I J F B
+ B...C G H D E B C
+ ^D B C E I J F B C
+ C^@ I J F
+ F^! D G H D F
Author
------