diff --git a/dot_config/git/config.tmpl b/dot_config/git/config.tmpl
index 29f4c54..bc2bdff 100644
--- a/dot_config/git/config.tmpl
+++ b/dot_config/git/config.tmpl
@@ -8,6 +8,20 @@
 	quotepath = false
 	commitGraph = true
 	logallrefupdates = true
+#{{- if lookPath "delta" }}#
+	pager = delta
+
+[interactive]
+	diffFilter = delta --color-only
+
+[delta]
+	navigate = true    # use n and N to move between diff sections
+	light = false      # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
+	line-numbers = true
+
+[merge]
+	conflictstyle = diff3
+#{{- end }}#
 
 [color]
 	branch = auto
@@ -58,6 +72,9 @@
 [push]
 	default = simple
 
+[pull]
+	rebase = false
+
 [init]
 	defaultBranch = main
 
@@ -75,6 +92,9 @@
 
 [diff]
 	algorithm = histogram
+#{{- if lookPath "delta" }}#
+	colorMoved = default
+#{{- end }}#
 
 [safe]
 	directory = *