git difftool 运行 git diff

Question

我显然在这里忽略了一些非常简单的东西，但我没有看到它。命令

webstorm diff ~/test.txt ~/test2.txt

运行 JetBrains 图形差异工具。我正在运行 git 1.8.3.2 并且有一个包含

的 git .config

[diff]
    tool = webstorm
[difftool "webstorm"]
    cmd = webstorm diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
[difftool]
    prompt = false

当我运行命令时

git difftool ~/test.txt ~/test2.txt

我在终端窗口中得到以下信息:

diff --git a/home/mark/test.txt b/home/mark/test2.txt
index 7379ce2..6ce16f1 100644
--- a/home/mark/test.txt
+++ b/home/mark/test2.txt
@@ -1,2 +1,2 @@
-blah
+bluergh

我做错了什么/没做什么？

Answer 1

运行:

GIT_TRACE=1 git difftool --tool-help

打印可与 --tool 一起使用但不可用的 diff 工具列表。

---

其次，我相信以下简化示例可能会更好:

[difftool "webstorm"]
  cmd = webstorm diff "$LOCAL" "$REMOTE"

或者通过指定二进制文件或脚本的路径，例如

[difftool]
  prompt = NO
  external = /usr/local/bin/diffmerge

---

通过以下方式检查差异配置:

git config --get-regex diff

或者更具体地说(将 webstorm 替换为您的工具名称):

git config --get difftool.webstorm.cmd

---

如果仍然不起作用，请在新存储库上测试它，例如通过执行以下命令:

mkdir ~/git_test && cd ~/git_test
git init && touch file && git add file && git commit -m'Adds file' -a
echo changed >> file
GIT_TRACE=1 git difftool

如果以上有效，请确保您的存储库配置没有任何意外，例如

more "$(git rev-parse --show-toplevel)"/.git/config

---

如果你处于 merge 状态(通过git status检查)，你需要使用mergetool，例如

git mergetool

^{添加-t tool 指定使用哪个工具。 git mergetool --tool-help 可用的列表。}

---

另见 man git-difftool:

CONFIG VARIABLES
       git difftool falls back to git mergetool config variables when the difftool equivalents have not been
       defined.

       diff.tool
           The default diff tool to use.

       diff.guitool
           The default diff tool to use when --gui is specified.

       difftool.<tool>.path
           Override the path for the given tool. This is useful in case your tool is not in the PATH.

       difftool.<tool>.cmd
           Specify the command to invoke the specified diff tool.

           See the --tool=<tool> option above for more details.

       difftool.prompt
           Prompt before each invocation of the diff tool.