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

Re: [PATCH] Add merge-subtree back

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Feb 24, 2008, 06:19 UTC
Message-ID
<alpine.LNX.1.00.0802240040010.19024@iabervon.org>
In-Reply-To
<7vprun32m2.fsf@gitster.siamese.dyndns.org>
On Sat, 23 Feb 2008, Junio C Hamano wrote:
> An earlier commit e1b3a2c (Build-in merge-recursive) made the
> subtree merge strategy backend unavailable.  This resurrects
> it.

That's really quite subtle. I think there should probably be a cmd_merge_subtree that shares almost everything with cmd_merge_recursive, but is a different function.

Or maybe there should be a "--subtree" option to merge that has that effect with arbitrary stratgeies by changing what gets sent to the strategy.

But restoring access to the strategy for now is obviously fine.
	-Daniel
*This .sig left intentionally blank*
Previous: Junio C HamanoNext: Miklos Vajna
Message 2 of 6 in “Add merge-subtree back”
  1. Add merge-subtree backJunio C Hamano, Feb 23, 2008
  2. Daniel BarkalowFeb 24, 2008
  3. New test to check the real "subtree" caseMiklos Vajna, Feb 28, 2008
  4. Johannes SchindelinFeb 28, 2008
  5. Improve t6029 to check the real "subtree" caseMiklos Vajna, Feb 28, 2008
  6. Johannes SchindelinFeb 28, 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.