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

External tool is ignored when using difftool with --no-index

From
SLSylvain Lacaze <sylvain@lacaze.me>
Date
Feb 13, 2019, 18:50 UTC
Message-ID
<CAH1FtBpcZJ8V4B=RJ0SfC+kehpmpaBGafDzXvi8i33rc++jOUw@mail.gmail.com>
Hi,

I have “p4merge” setup as diff.tool and merge.tool, and it work great in normal operation (i.e., “p4merge” opens), e.g:

$: git difftool HEAD~3 somePath/someFile.m

However, when I use “—no-index” to compare 2 arbitrary file, difftool just uses diff:

$: git difftool --no-index somePath/someFile.m somePath/someOtherFile.m $: git difftool --no-index --tool=p4merge somePath/someFile.m somePath/someOtherFile.m

Both the above command just yield normal diff.
I’m using the latest GIT build:

$: git version git version 2.20.1.windows.1

Best,
Sylvain
Next: Jeff King
Message 1 of 6 in “External tool is ignored when using difftool with --no-index”
  1. Sylvain LacazeFeb 13, 2019
  2. diff: reuse diff setup for --no-index caseJeff King, Feb 13, 2019
  3. Junio C HamanoFeb 14, 2019
  4. Jeff KingFeb 16, 2019
  5. Jeff KingFeb 24, 2019
  6. Junio C HamanoFeb 24, 2019

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.