]> git.ipfire.org Git - thirdparty/git.git/commitdiff
doc: revisions: single vs multi-parent notation comparison
authorPhilip Oakley <philipoakley@iee.org>
Fri, 12 Aug 2016 23:45:20 +0000 (00:45 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2016 02:36:44 +0000 (19:36 -0700)
Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/revisions.txt

index 64bc83eaa57ca0478442d5ece4966b13b856d356..f3a53a662b0dc3bbedc868774f56c3dc2a3140e4 100644 (file)
@@ -283,6 +283,10 @@ The 'r1{caret}@' notation means all parents of 'r1'.
 The 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents.
 By itself, this notation denotes the single commit 'r1'.
 
+While '<rev>{caret}<n>' was about specifying a single commit parent, these
+two notations consider all its parents. For example you can say
+'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'.
+
 Revision Range Summary
 ----------------------