ryon
V2EX  ›  问与答

osx下sourcetree里面的diff工具怎么匹配beyond compare?或者在gitconfig里面怎么配置?

  •  
  •   ryon · Dec 24, 2013 · 9935 views
    This topic created in 4549 days ago, the information mentioned may be changed or developed.
    有没有这样在用的同学,给个参考,总是打不开前后两个版本的文件。
    .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
    3 replies    2015-05-28 23:25:40 +08:00
    freefcw
        1
    freefcw  
       Dec 25, 2013
    直接在sourcetree的配置中配置为
    other
    /usr/local/bin/bcomp $LOCAL $REMOTE 就好了
    ryon
        2
    ryon  
    OP
       Dec 25, 2013
    @freefcw 打开的值有问题,只打开一个,打不开remote
    gmailzj
        3
    gmailzj  
       May 28, 2015
    查看下 git config --list
    我的是这个值可以打开,那两个变量间不要引号
    difftool.sourcetree.cmd=/usr/local/bin/bcomp $LOCAL $REMOTE
    About   ·   Help   ·   Advertise   ·   Blog   ·   API   ·   FAQ   ·   Solana   ·   4038 Online   Highest 6679   ·     Select Language
    创意工作者们的社区
    World is powered by solitude
    VERSION: 3.9.8.5 · 30ms · UTC 10:16 · PVG 18:16 · LAX 03:16 · JFK 06:16
    ♥ Do have faith in what you're doing.