如何配置Araxis Merge与Git一起使用?

问题描述

我知道Araxis Merge现在是Git的完全受支持的" mergetool，因此我在配置Git以使用它方面的许多知识已经过时了.特别是，Araxis Merge应该只需执行以下命令即可开箱即用"工作

git config --global merge.tool araxis

提供的araxis在我的PATH上.

但是，由于多种原因，不能选择修改PATH，因此我需要能够在.gitconfig中指定正确的path或cmd.

我应该如何配置Git(在OS X上)，以便它找到Araxis Merge?只需通过

[mergetool "araxis"]
     path = /Applications/Araxis Merge.app/Contents/Utilities/compare

跟随其他工具(例如kdiff3和p4merge)的示例

git config --global mergetool.araxis.path /Applications/Araxis Merge.app/Contents/MacOS/Araxis Merge

不起作用； (猜测)也不会

git config --global mergetool.araxis.path /Applications/Araxis Merge.app/Contents/Utilities/araxisgitmerge
git config --global difftool.araxis.path /Applications/Araxis Merge.app/Contents/Utilities/araxisgitdiff

我应该如何配置araxis.path?还有其他应与Araxis Merge一起使用的Git设置吗?

解决方案

Git现在直接使用Araxis compare实用程序，而不是araxisgitdiff和araxisgitmerge，因此只需将path设置为

/Applications/Araxis Merge.app/Contents/Utilities/compare

例如，通过执行

git config --global mergetool.araxis.path '/Applications/Araxis Merge.app/Contents/Utilities/compare'

或通过直接编辑~/.gitconfig将其包含

[mergetool "araxis"]
     path = /Applications/Araxis Merge.app/Contents/Utilities/compare

I understand that Araxis Merge is now a "fully supported" mergetool for Git, so that much of what I can find about configuring Git to use it is now out of date. In particular, Araxis Merge should work "out of the box" simply by executing

git config --global merge.tool araxis

provided araxis is on my PATH.

However, for a several reasons, amending my PATH is not an option, so I need to be able to specify the correct path or cmd in .gitconfig.

How should I configure Git (on OS X) so that it finds Araxis Merge? Simply following the example of other tools like kdiff3 and p4merge with

git config --global mergetool.araxis.path /Applications/Araxis Merge.app/Contents/MacOS/Araxis Merge

doesn't work; nor does (guessing) with

git config --global mergetool.araxis.path /Applications/Araxis Merge.app/Contents/Utilities/araxisgitmerge
git config --global difftool.araxis.path /Applications/Araxis Merge.app/Contents/Utilities/araxisgitdiff

How should I configure my araxis.path? Are there additional Git settings that should be used with Araxis Merge?

解决方案

Git now uses the Araxis compare utility directly, rather than araxisgitdiff and araxisgitmerge, so all that's needed is to set the path to

/Applications/Araxis Merge.app/Contents/Utilities/compare

for example, by executing

git config --global mergetool.araxis.path '/Applications/Araxis Merge.app/Contents/Utilities/compare'

or by directly editing ~/.gitconfig to contain

[mergetool "araxis"]
     path = /Applications/Araxis Merge.app/Contents/Utilities/compare

这篇关于如何配置Araxis Merge与Git一起使用?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！