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

Re: [PATCH 01/11] doc: trailer: fix grammar

From
LALinus Arver <linusa@google.com>
Date
May 8, 2023, 19:33 UTC
Message-ID
<owlypm7amxdn.fsf@fine.c.googlers.com>
In-Reply-To
<xmqqpm7aoclp.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
> "Linus Arver via GitGitGadget" <gitgitgadget@gmail.com> writes:
>> From: Linus Arver <linusa@google.com>
>> Signed-off-by: Linus Arver <linusa@google.com>
>> ---
>>   Documentation/git-interpret-trailers.txt | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
Show 6 quoted lines
>> diff --git a/Documentation/git-interpret-trailers.txt  
>> b/Documentation/git-interpret-trailers.txt
>> index 22ff3a603e0..e695977fbfa 100644
>> --- a/Documentation/git-interpret-trailers.txt
>> +++ b/Documentation/git-interpret-trailers.txt
>> @@ -14,7 +14,7 @@ SYNOPSIS
Show 7 quoted lines
>>   DESCRIPTION
>>   -----------
>> -Help parsing or adding 'trailers' lines, that look similar to RFC 822  
>> e-mail
>> +Parse or add 'trailer' lines, that look similar to RFC 822 e-mail
>>   headers, at the end of the otherwise free-form part of a commit
>>   message.
> Is that a grammatically incorrect sentence?

I think so. If we remove the dependent clauses starting with "that look similar ...", we just get

     Help parsing or adding 'trailers' lines

which cannot stand on its own as an independent clause. The correct version would be

     Help parse or add 'trailers' lines

which is what I first considered. However the auxiliary verb "help" here doesn't really mean much, because the interpret-trailers builtin already is _the_ authority for parsing or adding trailer lines, so I opted to remove it in my patch.

> The command does help doing these two things, but we can say the
> command does these two things without closing clarity, so I do not
> have an objection to the updated text
Exactly (I think you meant s/closing/losing here).
> (the only "ungrammatical" part
> may be that ", that look" should probably be "that look"), but I am
> not sure if "fix grammar" is a good explanation for this commit.

I think punctuation (especially with commas) can be pretty wide-ranging in terms of what is acceptable or not in terms of grammar. But looking at it again I like your version with the comma removed. I'll make the change locally for a v2 series.

Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 73 in “docs: interpret-trailers: reword and add examples”
  1. 00/11 docs: interpret-trailers: reword and add examplesLinus Arver via GitGitGadget, May 8, 2023
  2. 01/11 doc: trailer: fix grammarLinus Arver via GitGitGadget, May 8, 2023
  3. Junio C HamanoMay 8, 2023
  4. Linus ArverMay 8, 2023
  5. Junio C HamanoMay 8, 2023
  6. 02/11 doc: trailer: swap verb orderLinus Arver via GitGitGadget, May 8, 2023
  7. Junio C HamanoMay 8, 2023
  8. 03/11 doc: trailer: --no-divider: more precise languageLinus Arver via GitGitGadget, May 8, 2023
  9. Junio C HamanoMay 8, 2023
  10. 05/11 doc: trailer: remove redundant phrasingLinus Arver via GitGitGadget, May 8, 2023
  11. 04/11 doc: trailer: explain "commit mesage part" on first usageLinus Arver via GitGitGadget, May 8, 2023
  12. Junio C HamanoMay 8, 2023
  13. Linus ArverMay 10, 2023
  14. 07/11 doc: trailer: use angle brackets for <token> and <value>Linus Arver via GitGitGadget, May 8, 2023
  15. Junio C HamanoMay 8, 2023
  16. 06/11 doc: trailer: trailer.<token>.cmd: add missing verb phraseLinus Arver via GitGitGadget, May 8, 2023
  17. Junio C HamanoMay 8, 2023
  18. Linus ArverMay 10, 2023
  19. Junio C HamanoMay 10, 2023
  20. 08/11 doc: trailer.<token>.command: refer to existing exampleLinus Arver via GitGitGadget, May 8, 2023
  21. Junio C HamanoMay 8, 2023
  22. Linus ArverMay 10, 2023
  23. Junio C HamanoMay 10, 2023
  24. 09/11 doc: trailer.<token>.command: emphasize deprecationLinus Arver via GitGitGadget, May 8, 2023
  25. Junio C HamanoMay 8, 2023
  26. Linus ArverMay 10, 2023
  27. 10/11 doc: trailer: mention 'key' in DESCRIPTIONLinus Arver via GitGitGadget, May 8, 2023
  28. 11/11 doc: trailer: add more examples in DESCRIPTIONLinus Arver via GitGitGadget, May 8, 2023
  29. Junio C HamanoMay 8, 2023
  30. Junio C HamanoMay 8, 2023
  31. Linus ArverMay 8, 2023
  32. 0/9 docs: interpret-trailers: reword and add examplesLinus Arver via GitGitGadget, May 11, 2023
  33. 1/9 doc: trailer: fix grammarLinus Arver via GitGitGadget, May 11, 2023
  34. 2/9 doc: trailer: swap verb orderLinus Arver via GitGitGadget, May 11, 2023
  35. 3/9 doc: trailer: drop "commit message part" phrasingLinus Arver via GitGitGadget, May 11, 2023
  36. 5/9 doc: trailer: remove redundant phrasingLinus Arver via GitGitGadget, May 11, 2023
  37. 6/9 doc: trailer: use angle brackets for <token> and <value>Linus Arver via GitGitGadget, May 11, 2023
  38. 4/9 doc: trailer: examples: avoid the word "message" by itselfLinus Arver via GitGitGadget, May 11, 2023
  39. 9/9 doc: trailer: add more examples in DESCRIPTIONLinus Arver via GitGitGadget, May 11, 2023
  40. 7/9 doc: trailer.<token>.command: emphasize deprecationLinus Arver via GitGitGadget, May 11, 2023
  41. 8/9 doc: trailer: mention 'key' in DESCRIPTIONLinus Arver via GitGitGadget, May 11, 2023
  42. Junio C HamanoMay 12, 2023
  43. Linus ArverMay 16, 2023
  44. Junio C HamanoMay 16, 2023
  45. 0/9 docs: interpret-trailers: reword and add examplesLinus Arver via GitGitGadget, Jun 6, 2023
  46. 1/9 doc: trailer: fix grammarLinus Arver via GitGitGadget, Jun 6, 2023
  47. 2/9 doc: trailer: swap verb orderLinus Arver via GitGitGadget, Jun 6, 2023
  48. 3/9 doc: trailer: drop "commit message part" phrasingLinus Arver via GitGitGadget, Jun 6, 2023
  49. Christian CouderJun 14, 2023
  50. Linus ArverJun 15, 2023
  51. 4/9 doc: trailer: examples: avoid the word "message" by itselfLinus Arver via GitGitGadget, Jun 6, 2023
  52. Christian CouderJun 14, 2023
  53. Linus ArverJun 15, 2023
  54. 5/9 doc: trailer: remove redundant phrasingLinus Arver via GitGitGadget, Jun 6, 2023
  55. 6/9 doc: trailer: use angle brackets for <token> and <value>Linus Arver via GitGitGadget, Jun 6, 2023
  56. 7/9 doc: trailer.<token>.command: emphasize deprecationLinus Arver via GitGitGadget, Jun 6, 2023
  57. 8/9 doc: trailer: mention 'key' in DESCRIPTIONLinus Arver via GitGitGadget, Jun 6, 2023
  58. Christian CouderJun 14, 2023
  59. Linus ArverJun 15, 2023
  60. 9/9 doc: trailer: add more examples in DESCRIPTIONLinus Arver via GitGitGadget, Jun 6, 2023
  61. Christian CouderJun 14, 2023
  62. Linus ArverJun 15, 2023
  63. Christian CouderJun 15, 2023
  64. 0/9 docs: interpret-trailers: reword and add examplesLinus Arver via GitGitGadget, Jun 15, 2023
  65. 1/9 doc: trailer: fix grammarLinus Arver via GitGitGadget, Jun 15, 2023
  66. 2/9 doc: trailer: swap verb orderLinus Arver via GitGitGadget, Jun 15, 2023
  67. 3/9 doc: trailer: drop "commit message part" phrasingLinus Arver via GitGitGadget, Jun 15, 2023
  68. 5/9 doc: trailer: remove redundant phrasingLinus Arver via GitGitGadget, Jun 15, 2023
  69. 4/9 doc: trailer: examples: avoid the word "message" by itselfLinus Arver via GitGitGadget, Jun 15, 2023
  70. 6/9 doc: trailer: use angle brackets for <token> and <value>Linus Arver via GitGitGadget, Jun 15, 2023
  71. 7/9 doc: trailer.<token>.command: emphasize deprecationLinus Arver via GitGitGadget, Jun 15, 2023
  72. 8/9 doc: trailer: mention 'key' in DESCRIPTIONLinus Arver via GitGitGadget, Jun 15, 2023
  73. 9/9 doc: trailer: add more examples in DESCRIPTIONLinus Arver via GitGitGadget, Jun 15, 2023

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.