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

Re: Why does "merge --continue" expect no arguments?

From
Philip Oakley <philipoakley@iee.email>
Date
Dec 21, 2021, 17:57 UTC
Message-ID
<fcdef044-8bec-35b4-431f-40a79ed3c47b@iee.email>
In-Reply-To
<xmqqlf0dq3t3.fsf@gitster.g>
On 21/12/2021 17:13, Junio C Hamano wrote:
Show 10 quoted lines
> Or we could throw in another
>
>  * document more clearly that "merge --continue" is a mere synonym
>    for, and hint that there is no reason to favor it over, "git
>    commit".
>
> which happens to be my favourite so far after thinking the above
> through.
>
> Thanks.
I'm all for including the "document more clearly" approach...
With or without the code change.

-- Philip

Previous: Junio C HamanoNext: Ævar Arnfjörð Bjarmason
Message 6 of 12 in “Why does "merge --continue" expect no arguments?”
  1. Daniel VicarelDec 21, 2021
  2. Junio C HamanoDec 21, 2021
  3. Daniel VicarelDec 21, 2021
  4. Daniel VicarelDec 21, 2021
  5. Junio C HamanoDec 22, 2021
  6. Philip OakleyDec 21, 2021
  7. Ævar Arnfjörð BjarmasonDec 24, 2021
  8. Junio C HamanoDec 25, 2021
  9. Ævar Arnfjörð BjarmasonDec 26, 2021
  10. Junio C HamanoDec 27, 2021
  11. Daniel VicarelDec 23, 2021
  12. Junio C HamanoDec 23, 2021

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.