git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/2] diff, log doc: say "patch text" instead of "patches"

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 16, 2019, 19:58 UTC
Message-ID
<xmqqv9ts9fox.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<CAN0heSoaYf0_2FhKQNnswLvFppu=dyBcKGYB_Jd=uF70yjNiCQ@mail.gmail.com>
Martin Ågren <martin.agren@gmail.com> writes:
Show 9 quoted lines
> On Sun, 15 Sep 2019 at 21:26, Johannes Sixt <j6t@kdbg.org> wrote:
>>  I do not have the toolchain to check that a correct result is produced.
>
> But I do. I've tested this patch and 2/2 with AsciiDoc 8.6.10 and
> Asciidoctor 1.5.5, as well as with Asciidoctor 2.0.10 (on top of brian's
> recent patch so that it builds to begin with). They all render this
> nicely.
>
> Both of these patches seem like good changes to me.

Thanks, both. I am neutral between "patch" and "patch text", but if the latter is more easily understood by readers, that would be great. "patch *file*" certainly does sound misleading.

I wonder if the result becomes even clearer if we dropped "instead of the usual output". It is a given that presence of an option would change the behaviour, so "instead of the usual" does not add any value in the context of the explanation we are giving.

Also I question the value of the "running git diff without --raw option" sentence; "diff --stat" is also a way to suppress the patch text and see only the overview; I know it is not a new problem this patch introduces, but the objective of this patch is clarify about the generation of output in patch format, so...

Previous: Martin ÅgrenNext: Johannes Sixt
Message 4 of 6 in “diff, log doc: say "patch text" instead of "patches"”
  1. 1/2 diff, log doc: say "patch text" instead of "patches"Johannes Sixt, Sep 15, 2019
  2. 2/2 diff, log doc: small grammer, format, and language fixesJohannes Sixt, Sep 15, 2019
  3. Martin ÅgrenSep 16, 2019
  4. Junio C HamanoSep 16, 2019
  5. 1/2 diff, log doc: say "patch text" instead of "patches"Johannes Sixt, Sep 16, 2019
  6. Martin ÅgrenSep 17, 2019

Read the whole thread, see it on lore, or plain text.

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