Skip to content

Instantly share code, notes, and snippets.

@romainl

romainl/.gitconfig

Last active September 17, 2015 08:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save romainl/65331d96fa6c9c5a2e13 to your computer and use it in GitHub Desktop.
Save romainl/65331d96fa6c9c5a2e13 to your computer and use it in GitHub Desktop.
Download ZIP
Shut up, FileMerge.
Raw
.gitconfig
[diff]
tool = opendiff
[difftool]
cmd = /path/to/git_diff_wrapper
[merge]
tool = opendiff
[mergetool]
cmd = /path/to/git_diff_wrapper
Raw
git_diff_wrapper
#!/bin/sh
/usr/bin/opendiff "$2" "$5" -merge "$1" > /dev/null 2>&1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment