gistfile1.txt

[color]
	diff = auto
	status = auto
	branch = auto
	ui = auto
[log]
	date = local
[core]
	excludesfile = /Users/dweeks/.gitignore
	quotepath = false
[alias]
	br = branch
	ci = commit
	co = checkout
	st = status --short --branch
	sd = svn dcommit
	#sdl = !/Users/danimal/bin/git-svn-dcommitlist
	chdiff = difftool -y -t Changes
	ksdiff = difftool -y -t Kaleidoscope
	ngversion = describe --match '*_[0-9]*.[0-9]*'
	olog = log --oneline --decorate
	glog = log --oneline --decorate --graph
	wdiff = diff --word-diff
	x = !gitx
[merge]
    tool = chdiff
[mergetool "chdiff"]
    cmd = /usr/bin/env chdiff --wait $LOCAL $REMOTE
    keepBackup = false
    trustExitCode = false
[difftool "Changes"]
	cmd = chdiff \"$LOCAL\" \"$REMOTE\"
[difftool "Kaleidoscope"]
	cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
[difftool]
	prompt = false
[diff]
	tool = Kaleidoscope