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

Re: Any interest in 'git merge --continue' as a command

From
Jacob Keller <jacob.keller@gmail.com>
Date
Dec 9, 2016, 10:37 UTC
Message-ID
<025427FB-D91F-48B4-B031-5AE1C7BAC779@gmail.com>
In-Reply-To
<20161209091127.sxxczhfslrqsqs3m@sigill.intra.peff.net>
On December 9, 2016 1:11:27 AM PST, Jeff King <peff@peff.net> wrote:
Show 25 quoted lines
>On Fri, Dec 09, 2016 at 08:57:58PM +1300, Chris Packham wrote:
>
>> I hit this at $dayjob recently.
>> 
>> A developer had got themselves into a confused state when needing to
>> resolve a merge conflict.
>> 
>> They knew about git rebase --continue (and git am and git
>cherry-pick)
>> but they were unsure how to "continue" a merge (it didn't help that
>> the advice saying to use 'git commit' was scrolling off the top of
>the
>> terminal). I know that using 'git commit' has been the standard way
>to
>> complete a merge but given other commands have a --continue should
>> merge have it as well?
>
>It seems like that would be in line with 35d2fffdb (Provide 'git merge
>--abort' as a synonym to 'git reset --merge', 2010-11-09), whose stated
>goal was providing consistency with other multi-command operations.
>
>I assume it would _just_ run a vanilla "git commit", and not try to do
>any trickery with updating the index (which could be disastrous).
>
>-Peff
This makes sense to me.

Thanks, Jake

Previous: Jeff KingNext: Junio C Hamano
Message 3 of 26 in “Any interest in 'git merge --continue' as a command”
  1. Chris PackhamDec 9, 2016
  2. Jeff KingDec 9, 2016
  3. Jacob KellerDec 9, 2016
  4. Junio C HamanoDec 9, 2016
  5. Chris PackhamDec 10, 2016
  6. Jeff KingDec 10, 2016
  7. Jacob KellerDec 10, 2016
  8. merge: Add '--continue' option as a synonym for 'git commit'Chris Packham, Dec 12, 2016
  9. Markus HitterDec 12, 2016
  10. Chris PackhamDec 13, 2016
  11. Jeff KingDec 12, 2016
  12. 1/2 merge: Add '--continue' option as a synonym for 'git commit'Chris Packham, Dec 13, 2016
  13. 2/2 completion: add --continue option for mergeChris Packham, Dec 13, 2016
  14. Jeff KingDec 13, 2016
  15. Junio C HamanoDec 13, 2016
  16. 1/3 merge: Add '--continue' option as a synonym for 'git commit'Chris Packham, Dec 14, 2016
  17. 2/3 completion: add --continue option for mergeChris Packham, Dec 14, 2016
  18. 3/3 merge: Ensure '--abort' option takes no argumentsChris Packham, Dec 14, 2016
  19. Jeff KingDec 14, 2016
  20. Junio C HamanoDec 14, 2016
  21. Junio C HamanoDec 14, 2016
  22. Chris PackhamDec 15, 2016
  23. Junio C HamanoDec 15, 2016
  24. Jeff KingDec 15, 2016
  25. Jeff KingDec 10, 2016
  26. Junio C HamanoDec 10, 2016

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.