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

Re: [PATCH 3/3] Add -k/--keep-going option to mergetool

From
Jeff King <peff@peff.net>
Date
Oct 21, 2008, 11:12 UTC
Message-ID
<20081021111201.GA17363@coredump.intra.peff.net>
In-Reply-To
<1224583999-26279-3-git-send-email-charles@hashpling.org>
On Tue, Oct 21, 2008 at 11:13:19AM +0100, Charles Bailey wrote:
> This option stops git mergetool from aborting at the first failed merge.
> This allows some additional use patterns. Merge conflicts can now be
> previewed one at time and merges can also be skipped so that they can be
> performed in a later pass.

All 3 patches look good to me, and match what I expected from our earlier discussion. But I am not too familiar with mergetool, so take my approval with a grain of salt. :)

-Peff
Previous: Charles BaileyNext: Andreas Ericsson
Message 4 of 13 in “Fix some tab/space inconsistencies in git-mergetool.sh”
  1. 1/3 Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey, Oct 21, 2008
  2. 2/3 Add -n/--no-prompt option to mergetoolCharles Bailey, Oct 21, 2008
  3. 3/3 Add -k/--keep-going option to mergetoolCharles Bailey, Oct 21, 2008
  4. Jeff KingOct 21, 2008
  5. Andreas EricssonOct 21, 2008
  6. Charles BaileyOct 21, 2008
  7. Charles BaileyOct 22, 2008
  8. Junio C HamanoOct 22, 2008
  9. Charles BaileyOct 23, 2008
  10. William PursellOct 24, 2008
  11. Charles BaileyOct 24, 2008
  12. William PursellOct 25, 2008
  13. Charles BaileyNov 13, 2008

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.