summaryrefslogtreecommitdiff
path: root/.config/git/config
diff options
context:
space:
mode:
Diffstat (limited to '.config/git/config')
-rw-r--r--.config/git/config24
1 files changed, 24 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..c21bb15
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,24 @@
+[user]
+ email = sam@samnystrom.dev
+ name = Sam Nystrom
+
+[init]
+ defaultBranch = main
+
+[interactive]
+ singleKey = true
+
+[merge]
+ conflictstyle = diff3
+
+[diff]
+ colorMoved = default
+
+[sendemail]
+ annotate = yes
+ verify = off
+
+[commit]
+ verbose = true
+[push]
+ autoSetupRemote = true