AraxisMerge和beyond Compare作git mergetool配置

araxismerge compare git mergetool 配置栏目 Git 繁體版

原文原文链接

打开.gitconfig文件，加入以下代码便可git

[diff] 
    external = /Applications/AraxisMerge.app/Contents/Utilities/araxisgitdiff
    renames = true

[mergetool "araxis"] 
    cmd = '/Applications/AraxisMerge.app/Contents/Utilities/araxisgitmerge' "$PWD/$REMOTE" "$PWD/$BASE" "$PWD/$LOCAL" "$PWD/$MERGED"
    trustExitCode = false

[mergetool]
    keepBackup = false

[merge] 
    tool = araxis
    stat = true

执行git mergetool将会打开merge的文件对比窗口。app

Windows下面咱们能够用beyond compare来作merge工具工具

[diff]
    external = 'C:/Program Files (x86)/Beyond Compare 4/BCompare.exe' "$PWD/$LOCAL" "$PWD/$REMOTE"
    renames = true
 
[mergetool "bcomp"]
    cmd = 'C:/Program Files (x86)/Beyond Compare 4/BCompare.exe' "$PWD/$REMOTE" "$PWD/$BASE" "$PWD/$LOCAL" "$PWD/$MERGED"
    trustExitCode = false
 
[mergetool]
    keepBackup = false
 
[merge]
    tool = bcomp
    stat = true