galori/p4merge4git.md

Forked from tony4d/p4merge4git.md

Last active August 29, 2015 14:23

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/galori/4003b68fabb30716b1c2.js"></script>
Save galori/4003b68fabb30716b1c2 to your computer and use it in GitHub Desktop.

Download ZIP

Raw

p4merge4git.md

Download and install p4merge

Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
Copy only the p4merge.app file into your /Applications/ directory

Setup p4merge as a visual mergetool

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

Setup p4merge as a visual diff tool

$ git config --global diff.tool p4merge
$ git config --global difftool.p4merge.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