From 4bb67e782d9465d1c5bc76c4e2104155a1dcc22a Mon Sep 17 00:00:00 2001
From: mhsn <mail@mhsn.net>
Date: Tue, 25 Feb 2025 10:38:14 +0000
Subject: add a lot of extra settings to .gitconfig

---
 .gitconfig | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 4873314..8d61d96 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,13 +1,28 @@
+[alias]
+	adog = log --all --decorate --oneline --graph
+[branch]
+	sort = -committerdate
+[column]
+	ui = auto
+[commit]
+	verbose = true
+[diff]
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicPrefix = true
+	renames = true
+[help]
+	autocorrect = prompt
 [init]
 	defaultBranch = master
+[merge]
+	conflictstyle = zdiff3
+[pull]
+	rebase = true
 [push]
-    autoSetupRemote = true    
-[commit]
-    verbose = true
-[pager]
-	log = false
+	autoSetupRemote = true
+[tag]
+	sort = version:refname
 [user]
 	email = mail@mhsn.net
 	name = mhsn
-[alias]
-	adog = log --all --decorate --oneline --graph
-- 
cgit v1.2.3