[color] ui = auto [user] name = Todd email = todd@zzz.com [alias] br = branch ci = commit co = checkout st = status up = !git fetch && git rebase origin/master gpush = !git push origin HEAD:refs/for/master who = shortlog -s -- logs = log --pretty=oneline spull = !git-svn rebase spush = !git-svn dcommit [color] ui = auto branch = auto diff = auto status = auto [core] excludesfile = /Users/Todd/.gitignore_global editor = vim [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