From a2e3fe4f732e084ff1b09dd612f4c6869033e83c Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Tue, 27 Feb 2024 11:44:03 -0500
Subject: [PATCH] Better git diffs/merges, sort branches to show most recent
 active ones first

---
 git/.gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index 55b9201..4b7433c 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -25,5 +25,10 @@
 	ui = true
 [diff]
 	wsErrorHighlight = all
+    algorithm = histogram
 [commit]
 	verbose = true
+[merge]
+	conflictstyle = diff3
+[branch]
+	sort = -committerdate