summaryrefslogtreecommitdiff
path: root/dot-config/git/config
diff options
context:
space:
mode:
authorMathias Magnusson <mathias@magnusson.space>2026-01-06 00:57:02 +0100
committerMathias Magnusson <mathias@magnusson.space>2026-01-06 00:57:02 +0100
commit2b3f191572d429474f484624e3c6b83fdd7dd74b (patch)
tree09d9fd471cd4da9efefd62d421e863293158217e /dot-config/git/config
downloadymer-2b3f191572d429474f484624e3c6b83fdd7dd74b.tar.gz
Initial commit
Diffstat (limited to 'dot-config/git/config')
-rw-r--r--dot-config/git/config9
1 files changed, 9 insertions, 0 deletions
diff --git a/dot-config/git/config b/dot-config/git/config
new file mode 100644
index 0000000..441c814
--- /dev/null
+++ b/dot-config/git/config
@@ -0,0 +1,9 @@
+[init]
+ defaultBranch = master
+[merge]
+ conflictStyle = diff3
+[user]
+ email = mathias@magnusson.space
+ name = Mathias Magnusson
+[pull]
+ rebase = true