sourcetree 修改difftool 为 Beyond Compare 的方法

来源:互联网 发布:iphone6网络wifi不稳定 编辑:程序博客网 时间:2024/05/22 04:47

【原文:http://blog.csdn.net/w6611415/article/details/19755513  感谢作者】


sourcetree里设置不管用,google了下,可以通过修改 ~/.gitconfig 文件来实现。


[diff]
    tool = sourcetree
[difftool]
    prompt = false
[difftool "sourcetree"]
    cmd = 'C:/Program Files/Beyond Compare v3.3.4/App/BeyondCompare/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[merge]
    tool = sourcetree
[mergetool]
    prompt = false
[mergetool "sourcetree"]
    trustExitCode = true
    cmd = 'C:/Program Files/Beyond Compare v3.3.4/App/BeyondCompare/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"


参考:http://stackoverflow.com/questions/2069490/git-diff-with-beyond-compare
0 0