diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 672a17d..09513c6 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -1,13 +1,29 @@
 [user]
-    name = {{ .username }}
-    email = {{ .email }}
+	name = {{ .username }}
+	email = {{ .email }}
 [push]
-    default = simple
+	default = simple
 [commit]
-    verbose = true
-
+	verbose = true
 [init]
-    defaultBranch = main
+	defaultBranch = main
 [pull]
-    ff = only
-
+	ff = only
+[column]
+	ui = auto
+[branch]
+	sort = -committerdate
+[tag]
+	sort = version:refname
+[diff]
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicPrefix = true
+	renames = true
+[fetch]
+	prune = true
+	pruneTags = true
+[rebase]
+	updateRefs = true
+[merge]
+	conflictstyle = zdiff3