Skip to content

Instantly share code, notes, and snippets.

@GeoffCox

GeoffCox/git.config

Last active December 16, 2016 01:19
Show Gist options
  • Save GeoffCox/76f6f6b7f7486035f5b8 to your computer and use it in GitHub Desktop.
Save GeoffCox/76f6f6b7f7486035f5b8 to your computer and use it in GitHub Desktop.
Download ZIP
Update GIT.config to use Visual Studio for mergetool
Raw
git.config
[diff]
tool = vsdiffmerge
[difftool]
prompt = false
[difftool "vsdiffmerge"]
cmd = "'C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe' $LOCAL $REMOTE //t"
keepbackup = false
trustexitcode = true
[merge]
tool = vsdiffmerge
[mergetool]
prompt = false
[mergetool "vsdiffmerge"]
cmd = "'C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe' $REMOTE $LOCAL $BASE $MERGED //m"
keepbackup = false
trustexitcode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment