Re: merging .gitignore

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 2, 2007, 19:55 UTC
Message-ID: <7vodfhjnpe.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20071002195148.GA14171@lapse.madduck.net>

martin f krafft <madduck@madduck.net> writes:

Show 6 quoted lines

> Basically I am saying that it should be
>
>   cat $gitignore_files | sort -u
>
> and obviously, this is something for a specific merge driver, as
> Johannes suggested.

Perhaps you can use the existing union merge there.

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