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
Nov 15, 2008, 05:38 UTC
Message-ID
<20081115053841.GA20763@coredump.intra.peff.net>
In-Reply-To
<7vy6zl7drn.fsf@gitster.siamese.dyndns.org>
On Fri, Nov 14, 2008 at 09:35:08PM -0800, Junio C Hamano wrote:
Show 5 quoted lines
> > -'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]...
> 
> I wonder why this even needs to be an option.  If you do not want to
> resolve all of them, you can limit the amount of work you would do by
> giving list of paths to work on, can't you?

I don't know about Charles, but I often don't know that I don't want to merge a file using the graphical tool until I see it in the graphical tool. IOW, I start trying to merge it there and realize the conflict is such that I am better off doing it in my editor with conflict markers.

-Peff
Previous: Junio C HamanoNext: Charles Bailey
Message 10 of 14 in “git mergetool enhancements”
  1. Charles BaileyNov 13, 2008
  2. 1/3 Fix some tab/space inconsistencies in git-mergetool.shCharles Bailey, Nov 13, 2008
  3. 2/3 Add -y/--no-prompt option to mergetoolCharles Bailey, Nov 13, 2008
  4. 3/3 Add -k/--keep-going option to mergetoolCharles Bailey, Nov 13, 2008
  5. Jeff KingNov 14, 2008
  6. Charles BaileyNov 14, 2008
  7. Jeff KingNov 14, 2008
  8. Theodore TsoNov 15, 2008
  9. Junio C HamanoNov 15, 2008
  10. Jeff KingNov 15, 2008
  11. Charles BaileyNov 24, 2008
  12. Theodore TsoNov 15, 2008
  13. Charles BaileyNov 24, 2008
  14. Theodore TsoNov 15, 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.