diff --git a/home/.gitconfig b/home/.gitconfig index b29a5e3..e31f914 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -29,7 +29,7 @@ [core] # Exclude everything this file. Used for general exclusions. - excludesfile = /Users/stv0g/.gitignore + excludesfile = ~/.gitignore_global # Set attributes on files. Used for general diff improvements. attributesfile = ~/.gitattributes autocrlf = input @@ -41,7 +41,7 @@ [difftool "sourcetree"] cmd = code-insiders --diff --wait \"$LOCAL\" \"$REMOTE\" - path = + path = [mergetool "sourcetree"] cmd = code-insiders -n --wait \"$MERGED\" trustExitCode = true