
bc设置git 对比
git windows
diff
git config --global diff.tool bc
git config --global difftool.bc.path "c:/Program Files/Beyond Compare 5/bcomp.exe"
merge
git config --global merge.tool bc
git config --global mergetool.bc.path "c:/Program Files/Beyond Compare 5/bcomp.exe"
使用
# diff file
git difftool filename.ext
# diff dir
git difftool --dir-diff
# merge
git mergetool filename.txt
其他
git config --global difftool.prompt false
git config --global mergetool.keepBackup false
git linux
git 1.8版本及以上
diff
git config --global diff.tool bc
git config --global difftool.bc.trustExitCode true
merge
git config --global merge.tool bc
git config --global mergetool.bc.trustExitCode true
使用
git difftool file.ext
git mergetool file.ext
** git 1.7的暂时不记录了**
- TortoiseGit
- diff “C:\Program Files\Beyond Compare 5\BComp.exe” %base %mine /title1=%bname /title2=%yname /leftreadonly
- merge “C:\Program Files\Beyond Compare 5\BComp.exe” %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname