feat(git): enable some sensible defaults

git/config

@@ -1,56 +1,71 @@
 [user]
 	name = Matej Janežič
 	email = janezic.mj@gmail.com
-
-[core]
-	autocrlf = input
-	editor = nvim
-
-[user]
 	signingkey = AF349EECC849D87B790E88FF6318FFB7DB374B7D
 
 [commit]
 	gpgsign = true
+	verbose = true
 
 ; NOTE:(@janezicmatej) github/gitlab don't support these
 ; [push]
 ;	gpgsign = true
 
+[core]
+	autocrlf = input
+	editor = nvim
+
 [init]
 	defaultBranch = main
 
-[alias]
+[rebase]
-	blame = "!f() { [ -f .git-blame-ignore-revs ] && git blame --ignore-revs-file .git-blame-ignore-revs \"$@\" || git blame \"$@\"; }; f"
+	updateRefs = true
 
-[diff]
+[rerere]
-        tool = "nvimdiff"
+	enabled = true
-
+	autoUpdate = true
-[difftool]
-        prompt = true
-
-[difftool "nvimdiff"]
-        cmd = nvim -d "$LOCAL" "$REMOTE"
-
-[maintenance]
-        auto = true
-	strategy = incremental
 
 [merge]
-	tool = "nvimdiff"
+	tool = nvimdiff
+	conflictStyle = zdiff3
 
 [mergetool]
-	prompt = true
 	keepBackup = false
 	writeToTemp = true
 
 [mergetool "nvimdiff"]
 	layout = "LOCAL,BASE,REMOTE / MERGED"
 
-[includeIf "gitdir:~/git/git.aflabs.org/**"]
+[diff]
+	tool = nvimdiff
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicPrefix = true
+
+[difftool "nvimdiff"]
+	cmd = nvim -d "$LOCAL" "$REMOTE"
+
+[alias]
+	blame-ignore = "config blame.ignoreRevsFile .git-blame-ignore-revs"
+
+[branch]
+	sort = -committerdate
+
+[tag]
+	sort = version:refname
+
+[help]
+	autoCorrect = prompt
+
+[maintenance]
+	auto = true
+	strategy = incremental
+
+[includeIf "gitdir:~/git/git.aflabs.org/"]
 	path = ~/.config/git/config.d/aflabs.conf
 
-[includeIf "gitdir:~/git/gitlab.com/flarenetwork/**"]
+[includeIf "gitdir:~/git/gitlab.com/flarenetwork/"]
 	path = ~/.config/git/config.d/flare.conf
 
-[includeIf "gitdir:~/git/gitlab.com/flare-foundation/**"]
+[includeIf "gitdir:~/git/gitlab.com/flare-foundation/"]
 	path = ~/.config/git/config.d/flare.conf