diff --git a/.config/git/config b/.config/git/config
index 08bc4c39d281f482e787549b04bd12a4f0347be3..b3159505ad0c0b54ba784c938ac24554aa894ec0 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -44,23 +44,33 @@
     tracking = rev-parse --abbrev-ref --symbolic-full-name @{upstream}
     trigger = !git commit --allow-empty --no-edit --amend && git push --force-with-lease
 
+[branch]
+    sort = -committerdate
+
 [color]
     grep = true
     ui = auto
 
+[commit]
+    verbose = true
+
 [core]
     whitespace = space-before-tab,-indent-with-non-tab,trailing-space
 
 [diff]
     renames = copies
     tool = meld
+    algorithm = histogram
+    colorMoved = plain
 
 [difftool]
     prompt = false
 
 [fetch]
+    all = true
     fsckobjects = true
     prune = true
+    pruneTags = true
 
 [filter "ansible-vault"]
     clean = ANSIBLE_VERBOSITY=0 ansible-vault encrypt
@@ -89,12 +99,14 @@
 
 [rebase]
     autoSquash = true
+    updateRefs = true
 
 [receive]
     fsckObjects = true
 
 [tag]
     forceSignAnnotated = true
+    sort = version:refname
 
 [transfer]
     fsckobjects = true