Re: how to list commits on branch since last merge

From: Jeff King <peff@peff.net>
Date: Mar 8, 2011, 18:05 UTC
Message-ID: <20110308180533.GB1823@sigill.intra.peff.net>
In-Reply-To: <AANLkTimE52XWMtpuyaU7MbnyYVszKqNbTPSV=QxLyij3@mail.gmail.com>

On Tue, Mar 08, 2011 at 12:39:10PM -0500, Jay Soffian wrote:

Show 12 quoted lines

> >> 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:
> 
> No, because bar is never merged to foo. Let me relabel the picture:

Oh, of course. Sorry for the misdirection. Too little sleep. :)

> I guess this is not at all a common thing, since it seems to be
> confounding the list. :-)

Yeah, I think in many cases when "foo" and "bar" are merged, they both end up getting the merge commit, and "foo..bar" and "foo...bar" becomes a lot more useful.

Yours is more of a long-running maintenance branch scenario. Which is not all that uncommon, of course, but I can't remember a time when I wanted to ask for what you're looking for.

-Peff