gitconfig

[user]
	name = Thomas Queste
	email = tom@tomsquest.com
	signingkey = 0x46ABEB7FF623F5EB
[alias]
	fixup = !sh -c 'REV=$(git rev-parse $1) && git commit --fixup $@ && GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash $REV^' -
	squash = !sh -c 'REV=$(git rev-parse $1) && git commit --squash $@ && GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash $REV^' -
[core]
	excludesfile = ~/.gitignore
	autocrlf = input
 	pager = less -+$LESS -RSX
[pull]
	ff = only
[help]
	autocorrect = -1
[tag]
	sort = version:refname
[credential]
	helper = cache
[rerere]
	enabled = true
	autoupdate = true
[commit]
    # disable until I create a sub-key for git signing
    # gpgsign = true
[rebase]
	autoStash = true
	autoSquash = true
	updateRefs = true
[status]
	showUntrackedFiles = all
[fetch]
	prune = true
	pruneTags = true
	all = true
[push]
    # Push to matching remote branch, or create branch if missing
    # default is "simple" that does not create the remote branch
	default = current
	autoSetupRemote = true
[init]
	defaultBranch = main
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[diff "lockb"]
	textconv = bun
	binary = true
[diff]
    # Better diff algorithm
	algorithm = histogram
	colorMoved = plain
	mnemonicPrefix = true
	renames = true
[merge]
    # In diff, adds a ||||||| block that shows you what the block looked like before either of you changed it
	conflictstyle = zdiff3