diff --git a/setup-shell-configs.sh b/setup-shell-configs.sh
index 8c7e460..78bda46 100755
--- a/setup-shell-configs.sh
+++ b/setup-shell-configs.sh
@@ -207,40 +207,18 @@ cat <<EOF >"$HOME/.gitconfig"
 [include]
   path = "~/.config/themes.gitconfig"
 
-[push]
-  default = simple
-
-[user]
-  name = Andrew Coleman
-  email = penguincoder@gmail.com
-
 [advice]
   detachedHead = false
 
-[core]
-  filemode = true
-  eol = lf
-  autocrlf = input
-  pager = delta
+[alias]
+  logp = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
+  lg = log --graph --date-order --first-parent --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
+  lgb = log --graph --date-order --branches --first-parent --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
+  lga = log --graph --date-order --all --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
+  branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)'
 
-[init]
-  defaultBranch = main
-
-[delta]
-  line-numbers = true
-  file-style = omit
-  hunk-header-style = file
-
-[rebase]
-  autoStash = true
-
-[merge]
-  tool = vimdiff
-  conflictstyle = diff3
-  prompt = false
-
-[pull]
-  rebase = true
+[branch]
+  sort = -committerdate
 
 [color]
   branch = auto
@@ -258,16 +236,69 @@ cat <<EOF >"$HOME/.gitconfig"
   changed = green
   untracked = red
 
-[alias]
-  logp = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
-  lg = log --graph --date-order --first-parent \
-     --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
-  lgb = log --graph --date-order --branches --first-parent \
-     --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
-  lga = log --graph --date-order --all \
-   --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
-  up = pull --rebase
-  branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)'
+[column]
+  ui = auto
+
+[commit]
+  verbose = true
+
+[core]
+  filemode = true
+  eol = lf
+  autocrlf = input
+  pager = delta
+  # enable for large repositories
+  # fsmonitor = true
+  # untrackedCache = true
+
+[delta]
+  line-numbers = true
+  file-style = omit
+  hunk-header-style = file
+
+[diff]
+  algorithm = histogram
+  colorMoved = plain
+  mnemonicPrefix = true
+  refnames = true
+
+[fetch]
+  prune = true
+  pruneTags = true
+  all = true
+
+[help]
+  autocorrect = prompt
+
+[init]
+  defaultBranch = main
+
+[merge]
+  conflictstyle = zdiff3
+
+[pull]
+  rebase = true
+
+[push]
+  default = simple
+  autoSetupRemote = true
+  followTags = true
+
+[rebase]
+  autoStash = true
+  autoSquash = true
+  updateRefs = true
+
+[rerere]
+  enabled = true
+  autoupdate = true
+
+[tag]
+  sort = version:refname
+
+[user]
+  name = Andrew Coleman
+  email = penguincoder@gmail.com
 EOF
 
 cat <<EOF >"$HOME/.tmux.conf"