summaryrefslogtreecommitdiff
path: root/dot-config/git/config
diff options
context:
space:
mode:
authorMathias Magnusson <mathias@magnusson.space>2025-06-29 22:28:05 +0200
committerMathias Magnusson <mathias@magnusson.space>2025-06-29 22:47:23 +0200
commita0b32034f7c557bcaa38e3610c8a97eeee7a00a8 (patch)
tree3f4f1b7252958ccd8fa3158a35aeb34cdacf94c1 /dot-config/git/config
downloadsleipner-a0b32034f7c557bcaa38e3610c8a97eeee7a00a8.tar.gz
Initial commit
Diffstat (limited to 'dot-config/git/config')
-rw-r--r--dot-config/git/config7
1 files changed, 7 insertions, 0 deletions
diff --git a/dot-config/git/config b/dot-config/git/config
new file mode 100644
index 0000000..7a16e2f
--- /dev/null
+++ b/dot-config/git/config
@@ -0,0 +1,7 @@
+[init]
+ defaultBranch = master
+[merge]
+ conflictStyle = diff3
+[user]
+ email = mathias@magnusson.space
+ name = Mathias Magnusson