Re: [PATCH 0/2] Custom low-level merge driver support.

From: Martin Waitz <tali@admingilde.org>
Date: Apr 19, 2007, 07:52 UTC
Message-ID: <20070419075229.GA27208@admingilde.org>
In-Reply-To: <alpine.LFD.0.98.0704181330050.2828@woody.linux-foundation.org>

On Wed, Apr 18, 2007 at 01:35:05PM -0700, Linus Torvalds wrote:

Show 8 quoted lines

> So maybe each strategy could have "sub-strategies" for other file types.
> 
> Ie something like
> 
> 	[merge "ours"]
> 		name = pick our own version
> 		driver = /bin/true
> 		symlinks = /bin/true

or different attributes for other file types:

[attr] *@ merge=ours # for symlinks [attr] */ merge=submodule # for dirlinks

-- 
Martin Waitz

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