Re: [PATCH v5 06/12] doc: revisions: single vs multi-parent notation comparison

From: Marc Branchaud <marcnarc@xiplink.com>
Date: Aug 12, 2016, 14:40 UTC
Message-ID: <a3acb1fe-a1c2-cc66-315d-0dffb1291e8e@xiplink.com>
In-Reply-To: <20160812070749.2920-7-philipoakley@iee.org>

On 2016-08-12 03:07 AM, Philip Oakley wrote:

Show 19 quoted lines

> Signed-off-by: Philip Oakley <philipoakley@iee.org>
> ---
> 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.