summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorPhilip Oakley <philipoakley@iee.org>2016-08-13 00:45:20 +0100
committerJunio C Hamano <gitster@pobox.com>2016-08-13 19:36:44 -0700
commit39b4d85e5be4b8ab1352d4a24e8fceffb2b5e405 (patch)
tree60ef86526288b3fef0c105df8f46e8cf347738e9 /Documentation
parent59841a3900a5670084f30b8ab2bb49042938fee6 (diff)
downloadgit-39b4d85e5be4b8ab1352d4a24e8fceffb2b5e405.tar.gz
doc: revisions: single vs multi-parent notation comparison
Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/revisions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 64bc83eaa5..f3a53a662b 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -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
----------------------