.gitconfig (5afb2e8) - dotfiles.git · David Blume's GitList

.gitconfig

[user]
	name = dblume
	email = david.blume@gmail.com
[diff]
	tool = vimdiff
	noprefix = true
	submodule = log
	algorithm = histogram
[difftool]
	prompt = false
[difftool "vimdiff"]
	path = nvim
[color "blame"]
	highlightRecent = 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
[blame]
	date = short
[branch]
	sort = -committerdate
[push]
	default = simple
	autoSetupRemote = true
[core]
	editor = nvim
	excludesfile = ~/.gitignore
	whitespace = trailing-space,space-before-tab,tab-in-indent
[alias]
	log1 = log --graph --abbrev-commit --decorate --date=short --format=format:'%C(bold blue)%h%C(reset) %C(bold green)%ad%C(reset) %C(white)%s%C(reset) %C(dim white)%an%C(reset)%C(bold yellow)%d%C(reset)'
	log2 = log --graph --abbrev-commit --decorate --date short --format=format:'%C(bold blue)%h%C(reset) %C(bold cyan)%ad%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''        %C(white)%s%C(reset) %C(dim white)%an%C(reset)' --all
	logtree = log --graph --simplify-by-decoration --pretty=format:'%d' --all
[pull]
	# https://jvns.ca/blog/2024/02/01/dealing-with-diverged-git-branches/#there-s-no-one-solution
	ff = only
[init]
	defaultBranch = main
[fetch]
	prune = true
[merge]
	tool = vimdiff
	conflictstyle = diff3
[mergetool "vimdiff"]
	path = nvim
[tag]
	sort = -creatordate 
[grep]
	lineNumber = true
[commit]
	verbose = true
[include]
	path = ~/.gitconfig.local

dotfiles.git

Make nvim be the core, diff and merge editor