cygwin下配置git difftool
2017-11-29 13:27
253 查看
主要是配置路径问题,方法摘自网络,修改路径名字
[diff]
tool = jellybc4
[difftool]
prompt = false
[difftool "jellybc4"]
#use cygpath to transform cygwin path $LOCAL (something like /tmp/U5VvP1_abc) to windows path, because bc3 is a windows software
cmd = \"/cygdrive/c/Program Files/Beyond Compare 4/BCompare.exe\" \"$(cygpath -w $LOCAL)\" \"$REMOTE\"
[merge]
tool = jellybc4
[mergetool]
prompt = false
[mergetool "jellybc4"]
#trustExitCode = true
cmd = \"/cygdrive/c/Program Files/Beyond Compare 4/BCompare.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" \"$MERGED\"
[diff]
tool = jellybc4
[difftool]
prompt = false
[difftool "jellybc4"]
#use cygpath to transform cygwin path $LOCAL (something like /tmp/U5VvP1_abc) to windows path, because bc3 is a windows software
cmd = \"/cygdrive/c/Program Files/Beyond Compare 4/BCompare.exe\" \"$(cygpath -w $LOCAL)\" \"$REMOTE\"
[merge]
tool = jellybc4
[mergetool]
prompt = false
[mergetool "jellybc4"]
#trustExitCode = true
cmd = \"/cygdrive/c/Program Files/Beyond Compare 4/BCompare.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" \"$MERGED\"
相关文章推荐
- git difftool 第三方工具配置
- ubuntu下git配置difftool
- git diffmerge tool 配置
- git diff 配置 meld diff
- Git配置可视化的diff 和merge工具
- git difftool for mac
- 用Beyond Compare代替git的difftool和mergetool
- Git配置可视化的diff 和merge工具
- OSX下git diff/merge 可视化工具 P4Merge 环境配置步骤
- Mac下使用git difftool来做代码比较
- 把vscode 用作git difftool
- git diff/merge 配置
- windows下使用winmerge作为git difftool
- git配置diff、merge工具:kdiff3
- Mac下配置可视化git diff工具
- 转:Windows下Git的安装与配置(Cygwin)
- git difftool和mergetool图形化
- Git diff 配置
- 个人笔记之配置开发环境:将cygwin和git加入右键菜单
- Use vimdiff as git mergetool