Skip to content

Instantly share code, notes, and snippets.

@wxactly

wxactly/git-p4merge.sh

Created April 14, 2016 05:40
Show Gist options
  • Save wxactly/c324172c98648ff3e1784cb83b9053dd to your computer and use it in GitHub Desktop.
Save wxactly/c324172c98648ff3e1784cb83b9053dd to your computer and use it in GitHub Desktop.
Download ZIP
Install/configure p4merge as your git mergetool and difftool
Raw
git-p4merge.sh
brew cask install p4merge --force
git config --global merge.tool p4mergetool
git config --global mergetool.p4mergetool.cmd "$HOME/Applications/p4merge.app/Contents/Resources/launchp4merge \$PWD/\$BASE \$PWD/\$LOCAL \$PWD/\$REMOTE \$PWD/\$MERGED"
git config --global mergetool.keepBackup false
git config --global diff.tool p4mergetool
git config --global difftool.p4mergetool.cmd "$HOME/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