diff --git a/dot_config/git/config b/dot_config/git/config new file mode 100644 index 0000000..6087f99 --- /dev/null +++ b/dot_config/git/config @@ -0,0 +1,23 @@ +[init] + defaultBranch = main + +[author] + email = tyler@tylermayoff.com + name = Tyler Mayoff +[user] + email = tyler@tylermayoff.com + name = Tyler Mayoff +[core] + excludesFile = ~/.config/git/gitignore +[merge] + tool = vscode +[mergetool "vscode"] + cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED +[diff] + tool = vscode +[difftool "vscode"] + cmd = code --wait --diff $LOCAL $REMOTE +[pull] + rebase = true +[push] + autoSetupRemote = true