Re: [PATCH v3 1/2] git-merge-file doc: drop "-file" from argument placeholders

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 1, 2023, 23:53 UTC
Message-ID: <xmqq8r7howsq.fsf@gitster.g>
In-Reply-To: <20231101192419.794162-2-sandals@crustytoothpaste.net>

"brian m. carlson" <sandals@crustytoothpaste.net> writes:

Show 5 quoted lines

> From: Martin Ågren <martin.agren@gmail.com>
>
> `git merge-file` takes three positional arguments. Each of them is
> documented as `<foo-file>`. In preparation for teaching this command to
> alternatively take three object IDs, make these placeholders a bit more

Minor nit. Don't we want to say "three blob object names"? Unless we plan to grow this feature into accepting three tree object names, that is.

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