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

Re: [PATCH] Add [HOWTO] using merge subtree.

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 9, 2008, 06:28 UTC
Message-ID
<7v8x2zpl6n.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<7vfxx7psoq.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> * http://thread.gmane.org/gmane.comp.version-control.git/39443
>
> This was the explanation on the way how the initial git-gui
> subtree merge was created.
For the record, the very first cross-project merge is:
    http://thread.gmane.org/gmane.comp.version-control.git/5126

The procedure to maintain the resulting re-merge of two histories do not involve subtree merge because "The coolest merge ever" merges non-overlapping two trees at the same level, but the principle used to bootstrap the process is the same. You prepare a tree that is a overlay of the tips of your two projects, and record that tree in a commit that is a merge between two parents.

Previous: Junio C Hamano
Message 3 of 3 in “Re: [PATCH] Add [HOWTO] using merge subtree.”
  1. Junio C HamanoJan 9, 2008
  2. Junio C HamanoJan 9, 2008
  3. Junio C HamanoJan 9, 2008

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.