.gitconfig

[alias]

co = checkout
br = branch
st = status -uno

[user]
	name = nick
	email = [email protected]
[core]
	editor = vim
	excludesfile = /Users/nlehma/.gitignore_global
[color]
	ui = true
[push]
	default = simple
[diff]
	external = /Users/nlehma/bin/wrap-diff.sh
[gist]
	username = HomerJSimpson
	token = 7d2aea1f417f7b99ee22771f4a0174c4dad3e3c8
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[mergetool "sourcetree"]
	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true
[merge]
	tool = opendiff

wrap-diff.sh

#! /bin/bash
#opendiff "$6" "$7"
/usr/bin/opendiff "$2" "$5" -merge "$1" 2>/dev/null