diff --git a/configs/.gitconfig b/configs/.gitconfig index cdb0057..264a97d 100644 --- a/configs/.gitconfig +++ b/configs/.gitconfig @@ -12,7 +12,7 @@ editor = nvim whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol pager = delta - excludesfile = ~/.config/.gitignore_global + excludesfile = /Users/alicia/.config/.gitignore_global [web] browser = firefox [instaweb] @@ -268,3 +268,9 @@ smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true +[difftool "sourcetree"] + cmd = opendiff \"$LOCAL\" \"$REMOTE\" + path = +[mergetool "sourcetree"] + cmd = /Users/alicia/Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" + trustExitCode = true