Skip to content

Instantly share code, notes, and snippets.

@benwoodward

benwoodward/.gitconfig

Created May 9, 2012 09:21
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 benwoodward/2643265 to your computer and use it in GitHub Desktop.
Save benwoodward/2643265 to your computer and use it in GitHub Desktop.
Download ZIP
Working setup for p4merge with git 1.7 upwards.
Raw
.gitconfig
[merge]
tool = p4merge
keepBackup = false
[mergetool "p4merge"]
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
external = p4diff
Raw
p4diff
#!/bin/sh
[ $# -eq 7 ] && /usr/bin/p4merge "$2" "$PWD/$5"
Raw
p4merge
#!/bin/sh
/Applications/p4merge.app/Contents/MacOS/p4merge $*
@benwoodward
Copy link
Author

p4diff and p4merge scripts go in /usr/local/bin, don't forget to chmod 744 them.

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