From: Jeff King <peff@peff.net>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Finding a branch point in git
Date: Wed, 30 May 2012 17:45:22 -0400 [thread overview]
Message-ID: <20120530214522.GA3237@sigill.intra.peff.net> (raw)
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
prev parent reply other threads:[~2012-05-30 21:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-27 12:37 Finding a branch point in git Felipe Contreras
2012-05-28 6:20 ` Jeff King
2012-05-28 12:36 ` Felipe Contreras
2012-05-28 19:06 ` Jeff King
2012-05-30 17:07 ` Felipe Contreras
2012-05-30 21:54 ` Jeff King
2012-05-31 15:27 ` Felipe Contreras
2012-05-31 16:10 ` Felipe Contreras
2012-05-31 20:37 ` PJ Weisberg
2012-06-01 9:15 ` Felipe Contreras
2012-05-31 15:37 ` Martin Langhoff
2012-05-30 16:52 ` Felipe Contreras
2012-05-30 21:45 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120530214522.GA3237@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).