Skip to content

Instantly share code, notes, and snippets.

@Flushot

Flushot/setup.sh

Last active April 8, 2016 19:45
Show Gist options
  • Save Flushot/b135b5ebf2065c7bffba02a098adbab7 to your computer and use it in GitHub Desktop.
Save Flushot/b135b5ebf2065c7bffba02a098adbab7 to your computer and use it in GitHub Desktop.
Download ZIP
Configures Git to use p4merge so that you can run `git mergetool`
Raw
setup.sh
# Configure
git config --global merge.tool p4mergetool
git config --global mergetool.p4mergetool.cmd "/Applications/p4merge.app/Contents/Resources/launchp4merge \$PWD/\$BASE \$PWD/\$REMOTE \$PWD/\$LOCAL \$PWD/\$MERGED"
git config --global mergetool.p4mergetool.trustExitCode false
git config --global mergetool.keepBackup false
# Use with `git mergetool`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment