Re: [PATCH 3/2] merge-trees script for Linus git

From: Junio C Hamano <junkio@cox.net>
Date: Apr 16, 2005, 17:14 UTC
Message-ID: <7v64ym8wzu.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.58.0504160928250.7211@ppc970.osdl.org>

>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:

LT> Anyway, with the modified read-tree, as far as I can tell it will now LT> merge all the cases where one side has done something to a file, and the LT> other side has left it alone (or where both sides have done the exact same LT> modification). That should _really_ cut down the cases to just a few files LT> for most of the kernel merges I can think of.

LT> Does it do the right thing for your tests?

Yes.

$ 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.