Re: [PATCH v5 06/12] doc: revisions: single vs multi-parent notation comparison
From: Marc Branchaud <hidden>
Date: 2016-08-12 14:41:33
On 2016-08-12 03:07 AM, Philip Oakley wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Philip Oakley <redacted> --- new Junio's final comment https://public-inbox.org/git/xmqqwpkq6b4d.fsf%40gitster.mtv.corp.google.com/ --- Documentation/revisions.txt | 4 ++++ 1 file changed, 4 insertions(+)diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 0b5044d..934d071 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt@@ -284,6 +284,10 @@ The 'r1{caret}@' notation means all parents of 'r1'. 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents. This is the single commit 'r1', if standalone. +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^@', however you cannot say 'HEAD{caret}@{caret}2'.
That ^ should be {caret}, right?
M.