git config - 双差异和合并工具
[英]git config - double diff and merge tool
问题描述
I checked my git settings today and I found that I have 2 different diff and mergetools there.
我今天检查了我的 git 设置，发现那里有 2 个不同的差异和合并工具。 Is this normal?这是正常的吗？
1 个解决方案
解决方案1
0 2018-10-18 00:06:25
It is not normal , but it is not anything to worry about.这是不正常的，但不必担心。 With your config, you could for example run the following commands使用您的配置，您可以例如运行以下命令
git difftool -t sourcetree HEAD~ HEAD
git difftool -t p4mergetool HEAD~ HEAD
which would open the diff between the last two commits in the corresponding diff-tool.这将在相应的差异工具中打开最后两次提交之间的差异。 And you have set p4mergetool as default, so if you don't specify the tool, that one will be picked.并且您已将p4mergetool设置为默认值，因此如果您未指定该工具，则会选择该工具。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.
相关问题
默认的 git diff 工具（和合并工具）是什么？ - What is the default git diff tool(and merge tool)?
如何在 git 中使用不同的合并和差异工具？ - How to use different merge and diff tool in git?
git工具无法读取git的合并结果 - git merge result cannot be read by diff tool
使用 p4merge 作为 git diff 工具 - Using p4merge as git diff tool
git使用vs2012 diff工具进行合并 - git merge using the vs2012 diff tool
无法在 GIT 中将 KDiff3 设置为合并/差异工具 - Cannot set KDiff3 as merge/diff tool in GIT
如何将WinMerge用作Linux上安装的git的合并/差异工具 - How to use winmerge as the merge/diff tool for git installed on Linux
如何将Araxis设置为MSYS git的差异/合并工具？ - How to set Araxis as diff / merge tool for MSYS git?
为什么在添加merge.tool和diff.tool之后git paginate不起作用？ - Why does git paginate not work after adding merge.tool and diff.tool?
如何将 KDiff3 配置为 git 的合并工具和差异工具？ - How can I configure KDiff3 as a merge tool and diff tool for git?
相关标签