配置git_diftool工具

2016-10-08

window 和 mac 下的对比工具配置

首先下载Beyond Compare

windows: http://www.scootersoftware.com/BCompare-4.1.9.21719.exe
mac: http://www.scootersoftware.com/BCompareOSX-4.1.9.21719.zip
rm -rf “/Users/$(whoami)/Library/Application Support/Beyond Compare/registry.dat”

修改配置文件

找到git配置文件路径

windows: C:\Users\liqi.gitconfig
mac: ~/.gitconfig

在文件中添加以下代码,需要找到自己的Beyond Compare 4安装路径

window

[diff]
tool = bc4
[difftool]
prompt = false
[difftool "bc4"]
cmd = "\"C:\\Program Files\\Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\""
[merge]
tool = bc
[mergetool]
prompt = false
[mergetool "bc4"]
cmd = "\"C:\\Program Files\\Beyond Compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""

mac

设置为全局变量sudo ln -s /Applications/Beyond/ Compare.app/Contents/MacOS/bcomp /usr/local/bin

[diff]
  tool = bcomp
[difftool]
  prompt = false
[difftool "bcomp"]
  trustExitCode = true
  cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\"
[merge]
  tool = bcomp
[mergetool]
  prompt = false
[mergetool "bcomp"]
  trustExitCode = true
  cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"

命令行输入git difftool

比对当前文件相对于Head版本的改动
git difftool
跳出对面界面则配置成功