summaryrefslogtreecommitdiffstats
path: root/dotfiles/git
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--dotfiles/git/config22
1 files changed, 22 insertions, 0 deletions
diff --git a/dotfiles/git/config b/dotfiles/git/config
new file mode 100644
index 0000000..feaae67
--- /dev/null
+++ b/dotfiles/git/config
@@ -0,0 +1,22 @@
+[user]
+ name = Skullheadx
+ email = andrew@andrew-montgomery.dev
+
+[pull]
+ rebase = true
+
+[url "git@github.com:"]
+ insteadOf = https://github.com/
+
+[core]
+ pager = delta
+
+[interactive]
+ diffFilter = delta --color-only
+
+[delta]
+ navigate = true
+ dark = true
+
+[merge]
+ conflictStyle = zdiff3