Skip to content

Instantly share code, notes, and snippets.

@kellypleahy

kellypleahy/.gitconfig

Created August 4, 2010 02:41
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 kellypleahy/507551 to your computer and use it in GitHub Desktop.
Save kellypleahy/507551 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.gitconfig
[merge]
keepBackup = false;
tool = p4merge
[mergetool "p4merge"]
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
tool = p4diff
[difftool "p4diff"]
cmd = p4merge "$LOCAL" "$BASE"
keepTemporaries = false
trustExitCode = false
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment