From: Jeff King <peff@peff.net>
Date: Wed, 30 May 2012 21:45:22 GMT
Subject: Re: Finding a branch point in git
Message-ID: <20120530214522.GA3237@sigill.intra.peff.net>
In-Reply-To: <CAMP44s3pKo-Dzg6bTKNmjFsLSYvUfhXfk9NQJxOBTvFekqgrFA@mail.gmail.com>

On Wed, May 30, 2012 at 06:52:15PM +0200, Felipe Contreras wrote:

> > --X--A--B--C--D----E--F (master)
> >     |\           /  /
> >     | \         /  /
> >      \ G--H----I  /  (branch X)
> >       \       /  /
> >        K--L--M--O  (branch Y)
> >
> > The only merge between master and X is F, but its merge base is M. We
> > missed the earlier merge to master because it actually happened across
> > two different commits.
> 
> I assume you mean the merge between master and Y.

Oops, yes.

-Peff