specifying one-side of a merge commit?

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

On Wed, Aug 11, 2010 at 11:11 PM, Tay Ray Chuan [off-list ref] 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).

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