automated dev commit

git/.config/git/config

@@ -1,73 +1,111 @@
-# GitFlow related sections
-[gitflow "branch"]
-	master = master
-	develop = develop
-
-[gitflow "prefix"]
-	feature = feature/
-	release = release/
-	hotfix = hotfix/
-	bugfix = bugfix/
-	support = support/
-	versiontag = v
-
 [user]
 	email = marianoz@posteo.net
 	name = Mariano Z.
 	signingkey = 13D35660EC8E8AA03D4370A83FA93CB876C8FFAA
 
-
-[include]
-	path = ~/.config/git/gitalias.txt
 [core]
-	pager = diff-so-fancy | less --tabs=4 -RFX
 	autocrlf = input
 	excludesfile = ~/.config/git/.gitignore
 	compression = 9
 	whitespace = error
 	preloadindex = true
 
+[include]
+	path = ~/.config/git/gitalias.txt
+
+[includeIf "gitdir:~/Sync/"]
+	path = ~/Sync/Obsidian/.gitconfig
+
 [advice]
 	addEmptyPathspec = false
 	pushNonFastForward = false
 	statusHints = false
 
+[status]
+	branch = true
+	showStash = true
+	showUntrackedFiles = all
+
 [color]
 	ui = true
+
 [color "diff-highlight"]
 	oldNormal = red bold
 	oldHighlight = red bold 52
 	newNormal = green bold
 	newHighlight = green bold 22
+
 [color "diff"]
-	meta = yellow
+	meta = black bold
-	frag = magenta bold
+	frag = magenta
-	commit = yellow bold
+	context = white
-	old = red bold
+	whitespace = yellow reverse
-	new = green bold
+	old = red
-	whitespace = red reverse
+
+[color "blame"]
+	highlightRecent = 237, 20 month ago, 238, 19 month ago, 239, 18 month ago, 240, 17 month ago, 241, 16 month ago, 242, 15 month ago, 243, 14 month ago, 244, 13 month ago, 245, 12 month ago, 246, 11 month ago, 247, 10 month ago, 248, 9 month ago, 249, 8 month ago, 250, 7 month ago, 251, 6 month ago, 252, 5 month ago, 253, 4 month ago, 254, 3 month ago, 231, 2 month ago, 230, 1 month ago, 229, 3 weeks ago, 228, 2 weeks ago, 227, 1 week ago, 226
+
+[color "decorate"]
+	HEAD = red
+	branch = blue
+	tag = yellow
+	remoteBranch = magenta
+
+[color "branch"]
+	current = magenta
+	local = default
+	remote = yellow
+	upstream = green
+	plain = blue
+
+[interactive]
+	diffFilter = diff-so-fancy --patch
+	signlekey = true
+
 [credential]
 	helper = /usr/lib/git-core/git-credential-libsecret
-[mergetool "fugitive"]
+
-    cmd = vim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
-    #cmd = vim -f -c \"Gvdiffsplit!\" \"$MERGED\"
 [merge]
 	tool = fugitive
 	conflictStyle = diff3
+
 [icdiff]
 	options = --highlight --line-numbers
-#
+
-[pull]
+[diff]
-	rebase = true
+	context = 3
-[rebase]
+	renames = copies
-	autoStash = true
+	interHunkContext = 10
+
+[pager]
+	pager = diff-so-fancy | $PAGER
+
+[diff-so-fancy]
+	markEmptyLines = false
+
 [init]
 	defaultBranch = master
+
+[pull]
+	rebase = true
+	default = current
+
 [push]
 	autoSetupRemote = true
+	default = current
+	followTags = true
+
+[rebase]
+	autoStash = true
+	missingCommitsCheck = warn
+
+[commit]
+	gpgsign = true
+
+[log]
+	abbrevCommit = true
+	graphColors = blue,yellow,cyan,magenta,green,red
 
-# avoid issues where the `cargo audit` command tries to clone from a repo you do not have WRITE access to.
-# we already use SSH for every github repo, and so this puts the clone back to using HTTPS.
 [url "https://github.com/RustSec/advisory-db"]
 	insteadOf = https://github.com/RustSec/advisory-db
 
@@ -83,15 +121,5 @@
 	process = git-lfs filter-process
 	required = true
 
-[color "blame"]
-    highlightRecent = 237, 20 month ago, 238, 19 month ago, 239, 18 month ago, 240, 17 month ago, 241, 16 month ago, 242, 15 month ago, 243, 14 month ago, 244, 13 month ago, 245, 12 month ago, 246, 11 month ago, 247, 10 month ago, 248, 9 month ago, 249, 8 month ago, 250, 7 month ago, 251, 6 month ago, 252, 5 month ago, 253, 4 month ago, 254, 3 month ago, 231, 2 month ago, 230, 1 month ago, 229, 3 weeks ago, 228, 2 weeks ago, 227, 1 week ago, 226
-
-[commit]
-	gpgsign = true
-
 [alias]
 	bb = !better-git-branch.sh
-
-
-[includeIf "gitdir:~/Sync/"]
-	path = ~/Sync/Obsidian/.gitconfig