summaryrefslogtreecommitdiff
path: root/arch/git
diff options
context:
space:
mode:
Diffstat (limited to 'arch/git')
-rw-r--r--arch/git/.config/git/config21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/git/.config/git/config b/arch/git/.config/git/config
new file mode 100644
index 0000000..80978cd
--- /dev/null
+++ b/arch/git/.config/git/config
@@ -0,0 +1,21 @@
+[user]
+ name = "steven-na"
+ email = "noreply.github@stvnc.dev"
+
+[core]
+ editor = nvim
+
+[init]
+ defaultBranch = main
+
+[pull]
+ rebase = true
+
+[push]
+ autoSetupRemote = true
+
+[merge]
+ conflictstyle = diff3
+
+[diff]
+ colorMoved = default