偶尔,在处理我的存储库时,我会收到以下错误
fatal: cannot create directory at '': No such file or directory当我尝试使用Beyond Compare 4进行如下所示的比较时
'git difftool master head --dir-diff'这是我删除了个人信息的.gitconfig文件
[difftool "beyondcompare"]
cmd = c:\\program files\\beyond compare 4\\bcompare.exe
[core]
autocrlf = true
[difftool "bc4"]
cmd = C:/Program\\ Files/Beyond\\ Compare\\ 4/BCompare.exe \"$LOCAL\" \"$REMOTE\"
[diff]
tool = bc3
[difftool]
prompt = false
[user]
name = <REMOVED>
email = <REMOVED>
[credential "<REMOVED>"]
authority = <REMOVED>
[difftool "bc3"]
path = c:/Program Files/Beyond Compare 4/bcomp.exe
[diff]
tool = bc4
[difftool "bc4"]
cmd = \"c:/program files/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bc4
[mergetool "bc4"]
cmd = \"c:/program files/beyond compare 4/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true发布于 2017-06-22 02:17:06
这与您定义的宏有关。$local指向a/old_file,而远程指向diff上下文中的b/new_file。
另外要记住的是,git只会使用它为配置找到的最后一个值,除非它可以包含所有的键,所以你拥有的其他值不会被使用,并且会弄乱你的配置文件。
https://stackoverflow.com/questions/44682656
复制相似问题