diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 6bb0bd4..0f96c0d 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -2,21 +2,33 @@
 	email = {{ .email }}
 	name = {{ .name }}
 	signingkey = 1A80DDB584AF7DA7
+
 [core]
 	autocrlf = input
 	pager = delta
 	excludesfile = {{ .chezmoi.homeDir }}/.gitignore
+	fsmonitor = true
+	untrackedCache = true
+
+[column]
+    ui = auto
+
+[branch]
+    sort = -committerdate
+
+[tag]
+    sort = -version:refname
 
 [diff]
-	colorMoved = default
+	colorMoved = plain
 	tool = difftastic
+	algorithm = histogram
+	mnemonicPrefix = true
+    renames = true
 
 [pager]
 	difftool = true
 
-[pull]
-	rebase = true
-
 [difftool]
 	prompt = false
 
@@ -38,7 +50,22 @@
 	rebase = true
 
 [push]
+    default = simple
 	autoSetupRemote = true
+	followTags = true
+
+[fetch]
+    prune = true
+    pruneTags = true
+    all = true
+
+[rebase]
+    autoSquash = true
+    autoStash = true
+    updateRefs = true
+
+[merge]
+    conflictstyle = zdiff3
 
 [interactive]
 	diffFilter = delta --color-only
@@ -50,6 +77,11 @@
 
 [commit]
 	gpgsign = true
+	verbose = true
+
+[rerere]
+    enabled = true
+    autoupdate = true
 
 [init]
 	defaultBranch = main
@@ -67,3 +99,6 @@
 
 [diff "age"]
 	textconv = cat
+
+[help]
+    autocorrect = prompt