From 04bdd470fd553c8a2f71b0e2a2642d24e1ff6e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kmie=C4=87?= <KmcR@viessmann.com>
Date: Thu, 12 Jun 2025 22:42:22 +0200
Subject: [PATCH] Git: Improve defaults

---
 .gitconfig | 122 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 74 insertions(+), 48 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 5c35b32..07efeb3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,3 @@
-[push]
-	default = simple
 [user]
 	name = Robert Kmieć
 	email = KmcR@viessmann.com
@@ -7,38 +5,57 @@
 	editor = nvim
 	pager = delta
 	autocrlf = false
-	excludesfile = /home/rkmiec/.config/git/ignore
+	excludesfile = ~/.config/git/ignore
 	symlinks = true
 	attributesfile = ~/.gitattributes
 	fsmonitor = true
-	#attributesfile = ~/.gitattributes
+	untrackedCache = true
+[init]
+	defaultBranch = master
+[advice]
+	detachedHead = false
 [help]
 	autocorrect = 1
 [color]
 	ui = true
+[column]
+	ui = auto
 [grep]
 	linenumber = true
-[sendemail]
-	smtpencryption = tls
-	smtpserver = smtp.gmail.com
-	smtpuser = robert.r.kmiec@gmail.com
-	smtpserverport = 587
-[merge]
-	conflictstyle = diff3
-	tool = nfugitive
-[mergetool "nfugitive"]
-	cmd = nvim -c "Gvdiffsplit!" "$MERGED"
-[diff]
-	tool = nvimdiff
-[difftool "nvimdiff"]
-	cmd = nvim -d "$LOCAL" "$REMOTE"
-[diff "markdown"]
-	xfuncname = "^#+.*$"
+	parrernType = perl
+[fetch]
+	writeCommitGraph = true
+	all = true
+  #pruneTags = true
+[push]
+	default = simple
+	autoSetupRemote = true
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[pull]
+	rebase = true
+[rebase]
+	autosquash = true
+	autostash = true
+	updateRefs = true
+[commit]
+	template = .gitmessage
+	verbose = false
+; [mergetool "vimdiff"]
+;		cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[submodule]
+	recurse = false
+	fetchJobs = 4
+[rerere]
+	enabled = true
+	autoupdate = true
+[branch]
+	sort = committerdate
+[tag]
+	sort = version:refname
 [alias]
 	cm = commit
 	co = checkout
@@ -51,39 +68,48 @@
 	diff-image = "!f() { cd -- \"${GIT_PREFIX:-.}\"; GIT_DIFF_IMAGE_ENABLED=1 git diff \"$@\"; }; f"
 [interactive]
 	diffFilter = delta --color-only
-[delta]
-	features = side-by-side line-numbers decorations
-	whitespace-error-style = 22 reverse
-[delta "decorations"]
-	commit-decoration-style = bold yellow box ul
-	file-style = bold yellow ul
-	file-decoration-style = none
-[pull]
-	rebase = true
-[commit]
-	template = .gitmessage
-	verbose = false
-[mergetool "vimdiff"]
-	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
-[init]
-	defaultBranch = master
+[merge]
+	conflictstyle = zdiff3
+	tool = nfugitive
+[mergetool "nfugitive"]
+	cmd = nvim -c "Gvdiffsplit!" "$MERGED"
+[diff]
+	tool = nvimdiff
+	colorMoved = plain
+	algorithm = histogram
+	renames = true
+	mnemonicPrefix = true
+[difftool "nvimdiff"]
+	cmd = nvim -d "$LOCAL" "$REMOTE"
 [diff "image"]
 	command = /home/kmcr/tools/git-diff-image/git_diff_image
 	textconv = imgcat
 [diff "model"]
 	command = /home/kmcr/tools/git-diff-image/git_diff_image
 	textconv = imgcat
-[advice]
-	detachedHead = false
-[submodule]
-	recurse = false
-[rerere]
-	enabled = true
-[column]
-	ui = auto
-[branch]
-	sort = -commiterdate
-[fetch]
-	writeCommitGraph = true
+[diff "markdown"]
+	xfuncname = "^#+.*$"
+[delta]
+	features = decorations
+	navigate = true
+	dark = true
+	side-by-side = true
+	line-numbers = true
+	hyperlinks = true
+	whitespace-error-style = 22 reverse
+	# colorMoved support
+	map-styles = bold purple => syntax magenta, bold cyan => syntax blue
+	true-color = always
+[delta "decorations"]
+	commit-decoration-style = bold yellow box ul
+	file-style = bold yellow ul
+	file-decoration-style = none
 [maintenance]
 	repo = /home/kmcr/repos/hems/hemsmilsimulation
+[sendemail]
+	smtpencryption = tls
+	smtpserver = smtp.gmail.com
+	smtpuser = robert.r.kmiec@gmail.com
+	smtpserverport = 587
+[feature]
+	experimental = true