我想使用 Beyond compare 4 在 Windows 中为我的 git 存储库执行合并和差异。我已经设置了以下内容.gitconfig
,但是当我git diff
在 shell 中执行时,我获得了控制台内的文本差异,而不是打开 BC4。
我做错了什么?
这是我的.gitconfig
:
[merge]
tool = BeyondCompare4
[diff]
guitool = BeyondCompare4
tool = BeyondCompare4
[core]
editor = \"C:/Program Files (x86)/Vim/vim74/gvim.exe\"
autocrlf = True
[user]
name = My name
email = my@mail
[difftool "BeyondCompare4"]
cmd = \"C:/Program Files (x86)/Beyond Compare 4/Bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[mergetool "BeyondCompare4"]
cmd = \"C:/Program Files (x86)/Beyond Compare 4/Bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[push]
default = simple
[alias]
lg = log --pretty=format:'%C(yellow)%h%Cred%d%Creset - %C(cyan)%an %Creset: %s %Cgreen(%cr)' --decorate --graph --all --abbrev-commit
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
lastcommit = log --name-status HEAD^..HEAD
lastdiff = diff HEAD^..HEAD
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true