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

Re: How does git follow branch history across a merge commit?

From
Steven E. Harris <seh@panix.com>
Date
Aug 30, 2009, 00:29 UTC
Message-ID
<83ws4m3zzu.fsf@torus.sehlabs.com>
In-Reply-To
<7vy6p38p4j.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> *1* If you do not know what a merge simplification is, refer to e.g.
> http://gitster.livejournal.com/35628.html and notice there is a place
> where we follow "a parent that is the same as the merge result".

I read this article today with great interest. Had I known of it beforehand, it would have changed some of my flawed assumptions evident in my post. Thanks for writing that. I'll be looking into the rest of the articles there to learn more.

-- 
Steven E. Harris
Previous: Junio C HamanoNext: Björn Steinbrink
Message 6 of 7 in “How does git follow branch history across a merge commit?”
  1. Steven E. HarrisAug 28, 2009
  2. Junio C HamanoAug 28, 2009
  3. Junio C HamanoAug 28, 2009
  4. Steven E. HarrisAug 28, 2009
  5. Junio C HamanoAug 29, 2009
  6. Steven E. HarrisAug 30, 2009
  7. Björn SteinbrinkAug 29, 2009

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.