When I type git diff
, I want to view the output with my visual diff tool of choice (SourceGear \"diffmerge\" on Windows). How do I configure git to do this?
this works for me on windows 7. No need for intermediary sh scripts
contents of .gitconfig:
[diff]
tool = kdiff3
[difftool]
prompt = false
[difftool "kdiff3"]
path = C:/Program Files (x86)/KDiff3/kdiff3.exe
cmd = "$LOCAL" "$REMOTE"
you can use git difftool
.
for example if you have meld, you can edit the branchs master
and devel
by:
git config --global diff.external meld
git difftool master..devel