Skip to content

Instantly share code, notes, and snippets.

@moltak

moltak/.gitconfig

Last active August 29, 2015 14:01
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 moltak/342b040bd27091aacc8f to your computer and use it in GitHub Desktop.
Save moltak/342b040bd27091aacc8f to your computer and use it in GitHub Desktop.
Download ZIP
git mergetool
Raw
.gitconfig
[core]
editor = subl -n -w
[merge]
tool = p4merge
[mergetool "p4merge"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment