From 1a2459e5481770d92f711ad31b59a4bcd7b520f5 Mon Sep 17 00:00:00 2001
From: Jason Morganson <128727+jasonmorganson@users.noreply.github.com>
Date: Mon, 18 Mar 2024 23:13:29 -0400
Subject: [PATCH] Update .config/git/config

---
 dot_config/git/config | 76 ++++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 30 deletions(-)

diff --git a/dot_config/git/config b/dot_config/git/config
index b4ddbe91..cdee2e28 100644
--- a/dot_config/git/config
+++ b/dot_config/git/config
@@ -1,56 +1,72 @@
 [include]
     path = color
 
+[includeIf "gitdir:/workspaces/"]
+    path = codespace
+
 [help]
-    autocorrect = 1
+    autocorrect = immediate
 
 [core]
     pager = delta --diff-so-fancy
 
-[interactive]
-    diffFilter = delta --diff-so-fancy --color-only
+[user]
+	name = Jason Morganson
+	email = 128727+jasonmorganson@users.noreply.github.com
 
-[delta]
-    navigate = true
+[credential "https://github.com"]
+	helper =
+	helper = !gh auth git-credential
 
-[merge]
-    conflictstyle = diff3
+[credential "https://gist.github.com"]
+	helper =
+	helper = !gh auth git-credential
 
-[diff]
-    colorMoved = default
+[filter "lfs"]
+    process = git-lfs filter-process
+    required = true
+    clean = git-lfs clean -- %f
+    smudge = git-lfs smudge -- %f
+
+[fetch]
+    prune = true
 
 [pull]
     rebase = true
 
+[commit]
+    verbose = true
+    
+[absorb]
+    maxStack=100
+
 [push]
     default = current
+    autoSetupRemote = true
+
+[merge]
+    conflictstyle = zdiff3
 
 [rebase]
+    autostash = true
     autosquash = true
     updateRefs = true
+    missingCommitsCheck = error
 
-[filter "lfs"]
-    process = git-lfs filter-process
-    required = true
-    clean = git-lfs clean -- %f
-    smudge = git-lfs smudge -- %f
+[rerere]
+    enabled = true
 
-[user]
-	name = Jason Morganson
-	email = 128727+jasonmorganson@users.noreply.github.com
+[sequence]
+	editor = interactive-rebase-tool
 
-[credential "https://github.com"]
-	helper =
-	helper = !gh auth git-credential
+[interactive]
+    diffFilter = delta --diff-so-fancy --color-only
 
-[credential "https://gist.github.com"]
-	helper =
-	helper = !gh auth git-credential
+[delta]
+    navigate = true
 
-[includeIf "gitdir:/workspaces/"]
-    path = codespace
-[sequence]
-	editor = interactive-rebase-tool
-	
-[absorb]
-    maxStack=100
+[diff]
+    algorithm = histogram
+    colorMoved = default
+    colorMovedWS = allow-indentation-change
+