Skip to content

Instantly share code, notes, and snippets.

@AlexZeitler

AlexZeitler/.gitconfig

Forked from samsalisbury/.gitconfig
Created November 28, 2015 14:42
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 AlexZeitler/429856f8fc20fee3b6cc to your computer and use it in GitHub Desktop.
Save AlexZeitler/429856f8fc20fee3b6cc to your computer and use it in GitHub Desktop.
Download ZIP
Git diff and merge with p4merge (OSX)
Raw
.gitconfig
[merge]
keepBackup = false
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
[diff]
tool = p4merge
[difftool "p4merge"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$REMOTE\"" "\"$LOCAL\""
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment