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

Re: git mergetool ignores configured command line

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 23, 2011, 09:52 UTC
Message-ID
<7vaa8s592k.fsf@alter.siamese.dyndns.org>
In-Reply-To
<m21uu4hzmq.fsf@linux-m68k.org>
Andreas Schwab <schwab@linux-m68k.org> writes:
> diffuse is already a predefined merge tool, so mergetool.diffuse.cmd is
> ignored.  Try using a different name.
I wonder if we can improve this, though.

It is nice that we give canned definition of argument order to so many obscure tools, but instead of ignoring mergetool.<tool>.cmd when the user told us to use <tool>, couldn't we simply ignore what we have internally as canned definition?

Even if such a change were too intrusive (I didn't check), could we have a decency to at least warn that we are ignoring the configuration?

Previous: Andreas SchwabNext: David Aguilar
Message 3 of 4 in “git mergetool ignores configured command line”
  1. Alexander VladimirovOct 23, 2011
  2. Andreas SchwabOct 23, 2011
  3. Junio C HamanoOct 23, 2011
  4. David AguilarOct 23, 2011

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.