From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jari Aalto <jari.aalto@cante.net>
Cc: git@vger.kernel.org
Subject: Re: git-rev-parse(1) questions
Date: Mon, 30 Apr 2007 20:51:48 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.64.0704302036520.29859@racer.site> (raw)
In-Reply-To: <mz0pwwi3.fsf@cante.net>
Hi,
On Mon, 30 Apr 2007, Jari Aalto wrote:
> Could someone provide example commands where and how to use these:
>
> * A suffix ^ followed by an empty brace pair (e.g. v0.99.8^{})
> means the object could be a tag, and dereference the tag
> recursively until a non-tag object is found.
You can get at the _commit_ tagged with version 1.0.0 by doing "git
rev-parse v1.0.0^{}" (as opposed to the tag object).
> * A colon, optionally followed by a stage number (0 to 3) and a
> colon, followed by a path; this names a blob object in the index
> at the given path. Missing stage number (and the colon that
> follows it) names an stage 0 entry.
You can see that at best when you have a conflicted merge. For example, if
"git ls-files --unmerged" says that "README" is unmerged, "git show
:1:README" will show _your_ original version, while "git show :2:README"
will show the to-be-merged version.
Hth,
Dscho
prev parent reply other threads:[~2007-04-30 18:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-30 18:24 git-rev-parse(1) questions Jari Aalto
2007-04-30 18:49 ` Linus Torvalds
2007-04-30 20:20 ` Junio C Hamano
2007-04-30 18:51 ` Johannes Schindelin [this message]
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=Pine.LNX.4.64.0704302036520.29859@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jari.aalto@cante.net \
/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).