From 39b4d85e5be4b8ab1352d4a24e8fceffb2b5e405 Mon Sep 17 00:00:00 2001 From: Philip Oakley Date: Sat, 13 Aug 2016 00:45:20 +0100 Subject: doc: revisions: single vs multi-parent notation comparison Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano --- Documentation/revisions.txt | 4 ++++ 1 file changed, 4 insertions(+) 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 '{caret}' 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 ---------------------- -- cgit v1.2.1