Re: [PATCH v6 06/16] merge_recursive: abort properly upon errors

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 2, 2016, 22:28 UTC
Message-ID: <xmqqd1lqbybd.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1608021004080.79248@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> I tend to think that the underscore is correct: this change is not so much
> about the builtin (which is written with a dash) but about the function
> (written with an underscore, used by more than just merge-recursive, e.g.
> cherry-pick).

Yes, I agree. "merge-recursive:" prefix is about either the built-in command, or the machinery as a whole to support that built-in command. It is preferrable to use "merge_recursive():" if we are talking about a single function.

Thanks.

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