Skip to content

Instantly share code, notes, and snippets.

@alex-cellcity

alex-cellcity/.gitconfig

Created October 11, 2011 06:55
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 alex-cellcity/1277468 to your computer and use it in GitHub Desktop.
Save alex-cellcity/1277468 to your computer and use it in GitHub Desktop.
Download ZIP
Use FileMerge as Git diff tool
Raw
.gitconfig
...
[diff]
external = /usr/local/bin/gitdiffcmd.sh
Raw
gitdiffcmd.sh
#!/bin/bash
# put me into /usr/local/bin/gitdiffcmd.sh
# and chmod+x me
xattr -w com.apple.TextEncoding "UTF-8;134217984" "$2"
xattr -w com.apple.TextEncoding "UTF-8;134217984" "$5"
/usr/bin/opendiff "$2" "$5" -merge "$1"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment