-
Notifications
You must be signed in to change notification settings - Fork 294
Use VS Diff tool with Git and SourceTree
Ianko Djemerenov edited this page Oct 7, 2015
·
1 revision
It is quite complex to configure that using git config
command, therefore, you should blindly trust on the following configuration and append it to your global .gitconfig file (typically located in C:\Users\[UserName]
).
Note: The following is applicable for VS 2015. If you are using different version make sure to correct the path to the vsdiffmerge.exe file.
Important: This code will override the SourceTree configurations. It is suggested to backup your original .gitconfig file.
[diff]
tool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" //t \"$LOCAL\" \"$REMOTE\"
keepbackup = false
trustexistcode = true
[merge]
tool = vsdiffmerge
[mergetool]
prompt = true
[mergetool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" //m \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
keepbackup = false
trustexistcode = true
[difftool "sourcetree"]
cmd = 'C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe' //t $LOCAL $REMOTE
keepbackup = false
trustexistcode = true
[mergetool "sourcetree"]
cmd = 'C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe' //m $REMOTE $LOCAL $BASE $MERGED
keepbackup = false
trustExitCode = true
- Home
- Getting Started
- Deploying Documentation on IIS
- Git and GitHub Workflow
- Handling Redirects (link to the docs-seed wiki)
- Markdown Syntax (link to the docs-seed wiki)
- Markdown Nesting (link to the docs-seed wiki)
- Using Templates (link to the docs-seed wiki)
- Using Git and Git Bash
- Faster Jekyll Build via generate_exclude.rb Script
- Using Helper Tools
- Troubleshooting
- Use VS Diff tool with Git and SourceTree