git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Finding a branch point in git

From
Jeff King <peff@peff.net>
Date
May 30, 2012, 21:45 UTC
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:
Show 12 quoted lines
> > --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
Previous: Felipe Contreras
Message 13 of 13 in “Finding a branch point in git”
  1. Felipe ContrerasMay 27, 2012
  2. Jeff KingMay 28, 2012
  3. Felipe ContrerasMay 28, 2012
  4. Jeff KingMay 28, 2012
  5. Felipe ContrerasMay 30, 2012
  6. Jeff KingMay 30, 2012
  7. Felipe ContrerasMay 31, 2012
  8. Felipe ContrerasMay 31, 2012
  9. PJ WeisbergMay 31, 2012
  10. Felipe ContrerasJun 1, 2012
  11. Martin LanghoffMay 31, 2012
  12. Felipe ContrerasMay 30, 2012
  13. Jeff KingMay 30, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.