Skip to content

Instantly share code, notes, and snippets.

@stevenringo

stevenringo/.gitconfig

Created July 30, 2013 09:43
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save stevenringo/6111632 to your computer and use it in GitHub Desktop.
Save stevenringo/6111632 to your computer and use it in GitHub Desktop.
Download ZIP
gitconfig for using SourceGear's diffmerge: http://www.sourcegear.com/diffmerge/
Raw
.gitconfig
[diff]
prompt = false
tool = diffmerge
[difftool]
prompt = false
[merge]
prompt = false
tool = diffmerge
[mergetool]
prompt = false
keepBackup = false
[mergetool "diffmerge"]
cmd = diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustexitcode = false
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment