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

Re: [RFC] adding merge-node to parent lines in a commit

From
Junio C Hamano <junkio@cox.net>
Date
May 15, 2005, 22:36 UTC
Message-ID
<7v64xkqfqg.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<1441.10.10.10.24.1116194876.squirrel@linux1>
>>>>> "S" == Sean  <seanlkml@sympatico.ca> writes:
S> Yes, it's pretty basic unless i'm overlooking something:
    Rn---\
         Mn
         Mn-1
    Rn-1  |
    Rn-2  |
    Rn-3--/
    Initial

S> So for this particular case it's rather simple, the Rn merge S> node would have:

S> parent Rn-1 (ommitted) S> parent Mn Rn-3

Isn't that something you can obtain by scanning the parents and running merge-base across them without recording it in the commit?

Previous: SeanNext: Sean
Message 4 of 5 in “[RFC] adding merge-node to parent lines in a commit”
  1. SeanMay 15, 2005
  2. Junio C HamanoMay 15, 2005
  3. SeanMay 15, 2005
  4. Junio C HamanoMay 15, 2005
  5. SeanMay 15, 2005

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.