From: Luke Diamand <luke@diamand.org>
To: Git List <git@vger.kernel.org>
Subject: Tilde spec - befuzzled
Date: Tue, 28 Feb 2012 09:07:41 +0000 [thread overview]
Message-ID: <4F4C995D.9000504@diamand.org> (raw)
The documentation for caret and tilde specs is making my head hurt, even
though they always _do_ exactly what I want. And I thought I understood
them until I read more carefully.
A suffix '{caret}' to a revision parameter means the first parent of
that commit object. '{caret}<n>' means the <n>th parent (i.e.
'<rev>{caret}'
So far, so good.
'<rev>{tilde}<n>', e.g. 'master{tilde}3'::
A suffix '{tilde}<n>' to a revision parameter means the commit
object that is the <n>th generation grand-parent of the named
commit object, following only the first parents.
Hang on, *grand*-parents?
So HEAD~1 won't give me the *parent* commit of HEAD, but the
*grandparent* commit of HEAD (following only the first parents) ?
How do I get to the *parent* commit of HEAD?
Does that mean that HEAD~ != HEAD^
And why does HEAD~1 always look exactly what I would naively call the
'parent' of HEAD?
I'm pretty sure I'm missing something very obvious. I think it must
confuse other people as well though, as it's quite easy to find webpages
around that claim that tildes give the _parent_ commit.
Thanks
Luke
next reply other threads:[~2012-02-28 9:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 9:07 Luke Diamand [this message]
2012-02-28 9:50 ` Tilde spec - befuzzled Andreas Ericsson
2012-02-28 11:34 ` Thomas Rast
2012-02-28 19:20 ` Junio C Hamano
2012-02-29 1:18 ` Andrew Ardill
2012-02-29 7:34 ` Jeff King
2012-02-29 9:30 ` Andreas Ericsson
2012-02-29 9:32 ` Andreas Ericsson
2012-02-29 19:13 ` Re*: " Junio C Hamano
2012-03-02 9:25 ` Luke Diamand
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=4F4C995D.9000504@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
/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).