Skip to content

Instantly share code, notes, and snippets.

@denji

denji/.gitconfig

Forked from orj/.gitconfig
Created June 15, 2014 07:44
Show Gist options
  • Save denji/fff86a80aff5f8c8f645 to your computer and use it in GitHub Desktop.
Save denji/fff86a80aff5f8c8f645 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.gitconfig
[merge]
keepBackup = false
tool = custom
[mergetool "custom"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
@denji
Copy link
Author

denji commented Jun 15, 2014 

git config --global merge.tool p4merge
git config --global diff.tool p4merge
git config --global mergetool.prompt false
git config --global mergetool.keepBackup false
git config --global mergetool.keepTemporaries false
git config --global mergetool.p4merge.cmd '/Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment