gitconfig

[include]
	# Include [user] section from .gituser
	# name = My name
	# email = My email
	# signingkey = ssh-ed25519 AA....
	path = ~/.gituser
[color]
	ui = true
[core]
	excludesfile = $HOME/.gitignore
	autocrlf = input
	editor = nvim -f
[pull]
        ff = no
[merge]
	ff = no
	conflictstyle = diff3
	tool = kdiff3
	prompt = false
	keepBackup = false
[rebase]
	instructionFormat = (%an) %s
	autoStash = true
[difftool]
	tool = kdiff3
	prompt = false
[alias]
	# Editing and adding conflicted files: when we get many merge conflicts
	# and want to quickly solve them using an editor, then add the  files.
	add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
	br = branch
	cd = log --oneline --left-right --no-merges
	ci = commit -s
	co = checkout
	brcmp = show-branch
	edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; `git var GIT_EDITOR` `f`"
	firstcommit = log --diff-filter=A
	graph = log --graph --stat --pretty=oneline --abbrev-commit
	hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen %ai | %ar | %C(bold blue)<%an>%Creset' --abbrev-commit
	prune = fetch --prune
	publish = !"git push --set-upstream origin $(git branch-name)"
	rmremotebranch = push origin --delete
	st = status
	sup = submodule foreach git pull origin master
	thisbranch = log --color --date=short --pretty=format:'%h %ad %ae %s' --first-parent --no-merges
	undo = reset --soft HEAD^
[push]
	default = simple
	followTags = true
[status]
	showUntrackedFiles = all
[pull]
	ff = only
[init]
	defaultBranch = main
[commit]
	gpgsign = true
	verbose = true
[gpg]
	format = ssh
[gpg "ssh"]
	# This file should be in format:
	#   email@address.com ssh-ed25519 AA...
	# per line.
	allowedSignersFile = /home/weezel/.ssh/allowed_signers
[fetch]
	prune = true
[trim]
	bases = main,master