gitconfig

[user]
	name = Ryan Souza
	email = ryan@ryansouza.net
[core]
	excludesfile = /Users/scoz/.gitignore_global
	autocrlf = input
	quotepath = false
	mergeoptions = --no-commit
[diff]
	tool = Kaleidoscope
[difftool "Kaleidoscope"]
	cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"

[merge]
	tool = diffmerge
	conflictstyle = diff3

[alias]
	update = fetch --all
	pull-ff = pull --ff-only @{u}
	ff = merge --ff-only @{u}
	ff-rebase = rebase -p @{u}
	bmerge = merge --no-ff
	push-first = push -u
	st = status -sb
	co = checkout
	cp = cherry-pick
	branch-timestamps = for-each-ref --sort='authordate' --format='%(refname:short) : %(authordate)' refs/heads

[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

[github]
	user = scoz
[color]
	ui = true
[difftool]
	prompt = false
[push]
	default = simple