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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html