From 86487a04caf7d7d421bb60c1b3617dd4dc43e5b0 Mon Sep 17 00:00:00 2001
From: Amolith <amolith@secluded.site>
Date: Tue, 6 Dec 2022 15:01:06 -0500
Subject: [PATCH] clean up git config

---
 dot_config/git/config.tmpl | 59 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/dot_config/git/config.tmpl b/dot_config/git/config.tmpl
index 1bfbe4edc4cdc47b2ac4ac5187270a18dbeef6c5..d3dd394b5efd50e35f4a662651cdbf652a1489e7 100644
--- a/dot_config/git/config.tmpl
+++ b/dot_config/git/config.tmpl
@@ -1,40 +1,39 @@
-[help]
-    autoCorrect = never
-[init]
-    defaultBranch = master
 [user]
-    signingkey = 0x3572E5292CFCB5D9
-    name = Amolith
-    email = amolith@secluded.site
+	signingkey = 0x3572E5292CFCB5D9
+	name = Amolith
+	email = amolith@secluded.site
 [commit]
-    gpgsign = true
+	gpgsign = true
 [sendemail]
-    smtpserver = smtp.nixnet.email
-    smtpuser = amolith@secluded.site
-    smtpencryption = tls
-    smtpserverport = 587
-    annotate = yes
+	smtpserver = smtp.nixnet.email
+	smtpuser = amolith@secluded.site
+	smtpencryption = tls
+	smtpserverport = 587
+	annotate = yes
 [core]
-    pager = delta
+	pager = delta
 [delta]
-    line-numbers = true
-    {{- if eq .theme_variant "dark" }}
-    syntax-theme = base16
-    {{- end }}
-    {{- if eq .theme_variant "light" }}
-    syntax-theme = OneHalfLight
-    {{- end }}
+	line-numbers = true
+	{{- if eq .theme_variant "dark" }}
+	syntax-theme = base16
+	{{- end }}
+	{{- if eq .theme_variant "light" }}
+	syntax-theme = OneHalfLight
+	{{- end }}
 [interactive]
-    diffFilter = delta --color-only
+	diffFilter = delta --color-only
 [pull]
-    rebase = true
+	rebase = true
 [push]
-    followTags = true
-    autoSetupRemote = true
+	followTags = true
+	autoSetupRemote = true
+	default = current
+[branch]
+	autoSetupMerge = always
 [format]
-    signOff = yes
+	signOff = yes
 [filter "lfs"]
-    clean = git-lfs clean -- %f
-    smudge = git-lfs smudge -- %f
-    process = git-lfs filter-process
-    required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true