Re: [RFC PATCH] Re: Empty directories...

From: Nix <nix@esperi.org.uk>
Date: Jul 25, 2007, 22:43 UTC
Message-ID: <877iooxfxb.fsf@hades.wkstn.nix>
In-Reply-To: <f83bfv$95g$1@sea.gmane.org>

On 23 Jul 2007, Jakub Narebski spake thusly:

Show 8 quoted lines

> Nix wrote:
>
>> And the problem is that while git has a lot of strategies for merging
>> *trees*, its file merge system is totally unpluggable: it just falls
>> back to xdiff's merging system. I guess I'll have to add that feature :)
>
> Not true. You can add custom diff driver for files using gitattributes
> system.

Oo. Excellent, I didn't notice that. Thank you.

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