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

Re: [PATCH 3/4] Allow specifying specialized merge-backend per path.

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Apr 17, 2007, 15:16 UTC
Message-ID
<Pine.LNX.4.64.0704170815500.5473@woody.linux-foundation.org>
In-Reply-To
<11767973191314-git-send-email-junkio@cox.net>
On Tue, 17 Apr 2007, Junio C Hamano wrote:
>
> This allows 'merge' attribute to control how the file-level
> three-way merge is done per path.
Cool. Good job. The whole attribute thing seems to be really working out.
		Linus
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 6 in “Allow more than true/false to attributes.”
  1. 1/4 Allow more than true/false to attributes.Junio C Hamano, Apr 17, 2007
  2. 2/4 merge-recursive: separate out xdl_merge() interface.Junio C Hamano, Apr 17, 2007
  3. 3/4 Allow specifying specialized merge-backend per path.Junio C Hamano, Apr 17, 2007
  4. Junio C HamanoApr 17, 2007
  5. Linus TorvaldsApr 17, 2007
  6. 4/4 Add a demonstration/test of customized merge.Junio C Hamano, Apr 17, 2007

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.