Skip to content

Instantly share code, notes, and snippets.

@rcapraro

rcapraro/Git + P4merge

Created October 14, 2015 14:16
Show Gist options
  • Save rcapraro/aad8a8c3ad96fe563fce to your computer and use it in GitHub Desktop.
Save rcapraro/aad8a8c3ad96fe563fce to your computer and use it in GitHub Desktop.
Download ZIP
Setup P4merge as Git merge and diff tool
Raw
Git + P4merge
git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd 'p4merge.exe $LOCAL $REMOTE'
git config --global difftool.prompt false
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge.exe $BASE $LOCAL $REMOTE $MERGED'
git config --global mergetool.prompt false
git config --global mergetool.trustExitCode false
git config --global mergetool.keepBackup false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment