Skip to content

Instantly share code, notes, and snippets.

@avh4

avh4/set_up_diffmerge.sh

Created April 27, 2012 16:58
Show Gist options
  • Save avh4/2510802 to your computer and use it in GitHub Desktop.
Save avh4/2510802 to your computer and use it in GitHub Desktop.
Download ZIP
Git mergetool configurations
Raw
set_up_diffmerge.sh
# Download diffmerge from http://www.sourcegear.com/diffmerge/
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd "diffmerge --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"
git config --global mergetool.diffmerge.trustExitCode true
git config --global mergetool.keepBackup false
git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd "diffmerge \$LOCAL \$REMOTE"
Raw
set_up_kdiff3.sh
# Download kdiff3 from http://sourceforge.net/projects/kdiff3/files/kdiff3/
git config --global merge.tool kdiff3
git config --global mergetool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3
git config --global mergetool.kdiff3.trustExitCode false
git config --global mergetool.keepBackup false
git config --global diff.tool kdiff3
git config --global difftool.kdiff3./Applications/kdiff3.app/Contents/MacOS/kdiff3
git config --global difftool.kdiff3.trustExitCode false
Raw
set_up_p4merge.sh
# Download p4merge from http://www.perforce.com/downloads/complete_list
git config --global merge.tool p4merge
git config --global mergetool.p4merge.path /Applications/p4merge.app/Contents/Resources/launchp4merge
git config --global mergetool.p4merge.trustExitCode false
git config --global mergetool.keepBackup false
git config --global diff.tool p4merge
git config --global difftool.p4merge.path /Applications/p4merge.app/Contents/Resources/launchp4merge
git config --global difftool.p4merge.trustExitCode false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment