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

Re: [RFC PATCH 2/3] mergetools/kdiff3: allow opting-out of auto-merges

From
Junio C Hamano <gitster@pobox.com>
Date
May 9, 2013, 19:15 UTC
Message-ID
<7v38tw9d7r.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130509172334.GK25912@serenity.lan>
John Keeping <john@keeping.me.uk> writes:
Show 13 quoted lines
> On Thu, May 09, 2013 at 09:10:51AM -0700, Junio C Hamano wrote:
>> David Aguilar <davvid@gmail.com> writes:
>> 
>> > Marked "RFC" because I am kinda against adding more configuration
>> > variables.
>> 
>> Just like "git merge" has -X<option> escape hatch to allow us to
>> pass backend-specific options, perhaps you can add a mechanism to
>> "git mergetool" to let the user pass --no-auto from the command
>> line?
>
> We already have "mergetool.<tool>.cmd" which allows a completely custom
> command line to be specified.

Then probably it is a good idea to drop this patch and replace it with a documentation patch to suggest those who do not want --auto to use that mechanism?

Previous: John KeepingNext: David Aguilar
Message 8 of 11 in “mergetools/kdiff3: do not use --auto when diffing”
  1. 1/3 mergetools/kdiff3: do not use --auto when diffingDavid Aguilar, May 9, 2013
  2. 2/3 mergetools/kdiff3: allow opting-out of auto-mergesDavid Aguilar, May 9, 2013
  3. 3/3 Makefile: avoid deprecation warnings on OS X 10.8David Aguilar, May 9, 2013
  4. John KeepingMay 9, 2013
  5. David AguilarMay 9, 2013
  6. Junio C HamanoMay 9, 2013
  7. John KeepingMay 9, 2013
  8. Junio C HamanoMay 9, 2013
  9. David AguilarMay 9, 2013
  10. Charles BaileyMay 10, 2013
  11. David AguilarMay 10, 2013

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.