summaryrefslogtreecommitdiff
path: root/dot-config/git
diff options
context:
space:
mode:
Diffstat (limited to 'dot-config/git')
-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