Re: Finding a branch point in git
On Mon, May 28, 2012 at 8:20 AM, Jeff King <peff@peff.net> wrote:
Show 16 quoted lines
> There are also even more complex cases. It doesn't make much sense to
> ask about where branch Y split from master, since it actually came from
> branch X in the above example. But let's say we branched straight from
> master, merged our result to X, which got merged to master, and then we
> built some more commits on Y and merged them to master. Like:
>
> --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.
--
Felipe Contreras
Felipe Contreras <felipe.contreras@gmail.com>