Skip to content

Instantly share code, notes, and snippets.

@frak

frak/.gitconfig

Created May 15, 2014 15:47
Show Gist options
  • Star 2 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save frak/e9bae0a21cbdf2cb26dc to your computer and use it in GitHub Desktop.
Save frak/e9bae0a21cbdf2cb26dc to your computer and use it in GitHub Desktop.
Download ZIP
Graphical 3 way merging for Git using P4Merge
Raw
.gitconfig
# Download and install P4Merge from here: http://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools
# And then add this to your Git config
[merge]
tool = p4mergetool
[mergetool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
trustExitCode = false
[diff]
tool = p4mergetool
[difftool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment