[user] email = andrew@gioia.email name = Andrew Gioia [core] editor = subl -n -w excludesfile = /Users/andrew/.config/git/ignore [color] ui = true [diff] tool = smerge [difftool] prompt = true [difftool "smerge"] trustExitCode = true cmd = smerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" [merge] tool = smerge [mergetool] prompt = true [mergetool "smerge"] trustExitCode = true cmd = smerge mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\" [credential] helper = osxkeychain [credential "https://github.com"] username = andrewgioia #[gpg] # program = gpg2 [commit] gpgsign = true [pull] rebase = false [filter "lfs"] process = git-lfs filter-process required = true clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f