* specifying one-side of a merge commit?
@ 2010-08-12 5:11 Tay Ray Chuan
2010-08-12 6:01 ` Elijah Newren
2010-08-12 6:11 ` Björn Steinbrink
0 siblings, 2 replies; 3+ messages in thread
From: Tay Ray Chuan @ 2010-08-12 5:11 UTC (permalink / raw
To: Git Mailing List
Hi,
I wonder how do you guys do this?
So far, what I've come up with is this:
$ git rev-list $MERGE ^$MERGE^ | head -2 | tail -1
I'm sure there's a better way.
--
Cheers,
Ray Chuan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: specifying one-side of a merge commit?
2010-08-12 5:11 specifying one-side of a merge commit? Tay Ray Chuan
@ 2010-08-12 6:01 ` Elijah Newren
2010-08-12 6:11 ` Björn Steinbrink
1 sibling, 0 replies; 3+ messages in thread
From: Elijah Newren @ 2010-08-12 6:01 UTC (permalink / raw
To: Tay Ray Chuan; +Cc: Git Mailing List
On Wed, Aug 11, 2010 at 11:11 PM, Tay Ray Chuan <rctay89@gmail.com> wrote:
> Hi,
>
> I wonder how do you guys do this?
>
> So far, what I've come up with is this:
>
> $ git rev-list $MERGE ^$MERGE^ | head -2 | tail -1
>
> I'm sure there's a better way.
$MERGE^2
(^1 means first parent of a commit, ^2 means second parent, etc.
Plain '^' as suffix with no numeral implies ^1).
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: specifying one-side of a merge commit?
2010-08-12 5:11 specifying one-side of a merge commit? Tay Ray Chuan
2010-08-12 6:01 ` Elijah Newren
@ 2010-08-12 6:11 ` Björn Steinbrink
1 sibling, 0 replies; 3+ messages in thread
From: Björn Steinbrink @ 2010-08-12 6:11 UTC (permalink / raw
To: Tay Ray Chuan; +Cc: Git Mailing List
On 2010.08.12 13:11:52 +0800, Tay Ray Chuan wrote:
> Hi,
>
> I wonder how do you guys do this?
>
> So far, what I've come up with is this:
>
> $ git rev-list $MERGE ^$MERGE^ | head -2 | tail -1
>
> I'm sure there's a better way.
Are you looking for $MERGE^2? See SPECIFYING REVISIONS in
git-rev-parse(1).
Björn
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-12 6:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-12 5:11 specifying one-side of a merge commit? Tay Ray Chuan
2010-08-12 6:01 ` Elijah Newren
2010-08-12 6:11 ` Björn Steinbrink
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).