osx下sourcetree里面的diff工具怎么匹配beyond compare?或者在gitconfig里面怎么配置？
ryon 2013-12-24 23:05:14 +08:00 9651 次点击这是一个创建于 4360 天前的主题，其中的信息可能已经有所发展或是发生改变。
有没有这样在用的同学，给个参考，总是打不开前后两个版本的文件。
.gitconfig文件配置
[diff]
tool = bcompare
[difftool]
prompt = false
[merge]
tool = bcompare
[mergetool]
prompt = false
[difftool "bcompare"]
cmd = /usr/local/bin/bcompare diff -w \"$LOCAL\" \"$REMOTE\"
[mergetool "bcompare"]
cmd = /usr/local/bin/bcompare merge --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
.gitconfig文件配置
[diff]
tool = bcompare
[difftool]
prompt = false
[merge]
tool = bcompare
[mergetool]
prompt = false
[difftool "bcompare"]
cmd = /usr/local/bin/bcompare diff -w \"$LOCAL\" \"$REMOTE\"
[mergetool "bcompare"]
cmd = /usr/local/bin/bcompare merge --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
 | 1 freefcw 2013-12-25 10:10:02 +08:00 直接在sourcetree的配置中配置为 other /usr/local/bin/bcomp $LOCAL $REMOTE 就好了 |
 | 3 gmailzj 2015-05-28 23:25:40 +08:00 查看下 git config --list 我的是这个值可以打开，那两个变量间不要引号 difftool.sourcetree.cmd=/usr/local/bin/bcomp $LOCAL $REMOTE |
Select Language