Re: [PATCH v9 5/5] mergetool: add automerge_enabled tool-specific override function

From: Seth House <seth@eseth.com>
Date: Jan 7, 2021, 03:58 UTC
Message-ID: <20210107035806.GA530261@ellen>
In-Reply-To: <xmqqpn2ivcc1.fsf@gitster.c.googlers.com>

On Tue, Jan 05, 2021 at 09:55:26PM -0800, Junio C Hamano wrote:

> If the user explicitly says "I want the new behaviour enabled for
> this particular merge tool", we are better off letting the user use
> it and take responsibility for the possible breakage.

Good suggestion. Agreed on all counts. I'll roll that preference hierarchy into the v10 patch set.

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