From: Jeff King <peff@peff.net>
Date: Tue, 08 Mar 2011 17:12:51 GMT
Subject: Re: how to list commits on branch since last merge
Message-ID: <20110308171251.GA1823@sigill.intra.peff.net>
In-Reply-To: <AANLkTim_h6vbvnmy7oUNYmV82vCzLLfWKq=3_UY9kPYw@mail.gmail.com>

On Tue, Mar 08, 2011 at 05:11:16AM -0500, Jay Soffian wrote:

> Going back to my original picture, I mean commit m:
> 
>   o---o---x---o---...    foo
>    \       \
>     o---o---m---o---...  bar
> 
> merge-base foo bar gives me x; to get m I then need to grep the output
> of rev-list --parents for x.

Isn't the merge the first commit in bar that is not in foo? IOW:

  git rev-list foo..bar | tail -n 1

?

I admit it's not particularly elegant, though. And I haven't given
enough thought to decide whether that happens to work in your case, or
if it is more general. :)

-Peff