From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Andreas Heiduk <asheiduk@gmail.com>,
Duy Nguyen <pclouds@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 3/4] revisions.txt: mention <rev>~ form
Date: Sun, 5 May 2019 12:07:07 -0400 [thread overview]
Message-ID: <1ba823024edddfb0e6ccb92647137eccf5d4c7d0.1557072286.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1557072286.git.liu.denton@gmail.com>
In revisions.txt, the '<rev>^' form is mentioned but the '<rev>~' form
is missing. Although both forms are essentially equivalent (they each
get the first parent of the specified revision), we should mention the
latter for completeness. Make this change.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
Documentation/revisions.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index dd99770c47..a38ec7fb52 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -139,7 +139,9 @@ thing no matter the case.
'<rev>{caret}0' means the commit itself and is used when '<rev>' is the
object name of a tag object that refers to a commit object.
-'<rev>{tilde}<n>', e.g. 'master{tilde}3'::
+'<rev>{tilde}[<n>]', e.g. 'HEAD{tilde}, master{tilde}3'::
+ A suffix '{tilde}' to a revision parameter means the first parent of
+ that commit object.
A suffix '{tilde}<n>' to a revision parameter means the commit
object that is the <n>th generation ancestor of the named
commit object, following only the first parents. I.e. '<rev>{tilde}3' is
--
2.21.0.1049.geb646f7864
next prev parent reply other threads:[~2019-05-05 16:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1557071877.git.liu.denton@gmail.com>
2019-05-05 16:06 ` [PATCH v3 0/4] cleanup revisions.txt Denton Liu
2019-05-05 16:06 ` [PATCH v3 1/4] revisions.txt: change "rev" to "<rev>" Denton Liu
2019-05-05 16:07 ` [PATCH v3 2/4] revisions.txt: mark optional rev arguments with [] Denton Liu
2019-05-05 16:07 ` Denton Liu [this message]
2019-05-05 16:07 ` [PATCH v3 4/4] revisions.txt: remove ambibuity between <rev>:<path> and :<path> Denton Liu
2019-05-05 16:10 ` [PATCH v3 0/4] cleanup revisions.txt Denton Liu
2019-05-07 14:29 ` Denton Liu
2019-05-07 15:16 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1ba823024edddfb0e6ccb92647137eccf5d4c7d0.1557072286.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=asheiduk@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).