diff --git a/gitconfig b/gitconfig
index ffee3f0..3f8e842 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,60 +1,84 @@
 [user]
   name = brettlangdon
-  email = me@brett.is
+  email = brett.langdon@datadoghq.com
   signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPG5FWUNREaSQ7t/vyc+jNaiq4nmaNC07535tnpN3hCj
-[credential]
-  helper = store
+
+[alias]
+  dc = diff --cached
+  dm = diff origin/main
+
+[branch]
+  sort = -committerdate
+
+[column]
+  ui = auto
+
+[commit]
+  gpgsign = true
+  verbose = true
+
 [core]
-  excludesfile = /Users/brettlangdon/.gitignore_global
+  excludesfile = ~/.gitignore_global
   editor = emacs -nw -Q
   pager = delta --dark --keep-plus-minus-markers
   whitespace = trailing-space,space-before-tab
-[interactive]
-  diffFilter = delta --color-only
-[alias]
-  st = status
-  d = diff --color --minimal
-  dc = diff --color --minimal --cached
-  g = grep -p
-  dm = diff origin/main
+
+[credential]
+  helper = store
+
 [diff]
-  compactionHeuristic = true
   algorithm = histogram
-[push]
-  default = simple
-[grep]
-  lineNumber = true
-[commit]
-  gpgsign = true
-[color]
-  ui = true
-[color "diff-highlight"]
-  oldNormal = red bold
-  oldHighlight = red bold 52
-  newNormal = green bold
-  newHighlight = green bold 22
-[color "diff"]
-  meta = 227
-  frag = magenta bold
-  commit = 227 bold
-  old = red bold
-  new = green bold
-  whitespace = red reverse
+  colorMoved = plain
+  mnemonicPrefix = true
+  renames = true
+
+[fetch]
+  prune = true
+  pruneTags = true
+  all = true
+
+[github]
+  user = brettlangdon
+
 [gpg]
   format = ssh
+
 [gpg "ssh"]
   program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
-	allowedSignersFile = "/Users/brettlangdon/.config/git/allowed_signers"
-[tag]
-  forceSignAnnotated = true
-[pull]
-  rebase = true
+  allowedSignersFile = "/Users/brettlangdon/.config/git/allowed_signers"
+
+[grep]
+  lineNumber = true
+
+[help]
+  autocorrect = prompt
+
+[interactive]
+  diffFilter = delta --color-only
+
 [init]
   defaultBranch = main
-[filter "lfs"]
-  clean = git-lfs clean -- %f
-  smudge = git-lfs smudge -- %f
-  process = git-lfs filter-process
-  required = true
-[github]
-  user = brettlangdon
+
+[merge]
+  conflictstyle = zdiff3
+
+[pull]
+  rebase = true
+
+[push]
+  default = simple
+  autoSetupRemote = true
+  followTags = true
+
+[rebase]
+  autoSquash = true
+  autoStash = true
+  updateRefs = true
+
+[rerere]
+  enabled = true
+  autoupdate = true
+
+[tag]
+  sort = version:refname
+  forceSignAnnotated = true
diff --git a/gitignore_global b/gitignore_global
index 851fdda..10e18a8 100644
--- a/gitignore_global
+++ b/gitignore_global
@@ -8,3 +8,5 @@
 *.coverage
 htmlcov
 *.ccls-cache
+.gitlab-ci-local
+.clangd