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

Re: [PATCH 1/2] Documentation/git-merge.txt: fix reference to synopsis

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 20, 2023, 20:56 UTC
Message-ID
<xmqqy1dor3t5.fsf@gitster.g>
In-Reply-To
<20231220195342.17590-2-mi.al.lohmann@gmail.com>
Michael Lohmann <mial.lohmann@gmail.com> writes:
> Also the previous version did not acknowledge that `--no-merge` would
> result in the precondition being fulfilled (thanks to Elijah Newren and
> Junio C Hamano for pointing that out).

This does not belong to the log message. Please write for those who only read "git log" output after the work is merged and nothing else. To them, errors in the previous attempt that was pointed out by reviewers and corrected in this version do not exist.

It is perfectly fine to write something like the above after the three-dash line. That is the place to clue reviewers about the context of this round, reminding what happend in the previous iteration and what the differences this round has, etc.

Thanks.
Previous: Elijah NewrenNext: Michael Lohmann
Message 9 of 13 in “Documentation/git-merge.txt: fix reference to synopsys”
  1. Documentation/git-merge.txt: fix reference to synopsysMichael Lohmann, Dec 20, 2023
  2. René ScharfeDec 20, 2023
  3. Elijah NewrenDec 20, 2023
  4. René ScharfeDec 20, 2023
  5. Junio C HamanoDec 20, 2023
  6. 0/2 Documentation/git-merge.txt: fix reference to synopsisMichael Lohmann, Dec 20, 2023
  7. 1/2 Documentation/git-merge.txt: fix reference to synopsisMichael Lohmann, Dec 20, 2023
  8. Elijah NewrenDec 20, 2023
  9. Junio C HamanoDec 20, 2023
  10. 1/2 Documentation/git-merge.txt: fix reference to synopsisMichael Lohmann, Dec 20, 2023
  11. Junio C HamanoDec 20, 2023
  12. Michael LohmannDec 20, 2023
  13. 2/2 Documentation/git-merge.txt: use backticks for command wrappingMichael Lohmann, Dec 20, 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.