Skip to content

Instantly share code, notes, and snippets.

@trastle

trastle/.gitconfig_part

Created April 15, 2013 16:18
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 trastle/5389281 to your computer and use it in GitHub Desktop.
Save trastle/5389281 to your computer and use it in GitHub Desktop.
Download ZIP
Snippet from .gitconfig to use kdiff3 as the difftool and mergetool on OSX
Raw
.gitconfig_part
[alias]
dt = difftool
mt = mergetool
[diff]
tool = kdiff3
prpmpt = false
[merge]
tool = kdiff3
[difftool]
prompt = false
[mergetool]
prompt = false
[mergetool "kdiff3"]
path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
keepBackup = false
trustExitCode = false
[difftool "kdiff3"]
path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
keepBackup = false
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment