[apply]
	whitespace = fix

[core]
	# Declare erroenous the same whitespace errors vim does
	whitespace = space-before-tab,-indent-with-non-tab,trailing-space

[diff]
	# Detect both copies and renames in diffs
	renames = copies
	tool = vimdiff

[difftool]
	prompt = false

[merge]
	# Log merge activities to output
	log = true
	tool = vimdiff

[pretty]
	terse  = format:%C(auto,yellow)%h%C(auto,reset) %s %C(auto,green)(%cr) %C(auto,bold blue) %an %C(auto,reset)%C(auto,red)%d%C(auto,reset)

[push]
	# Reinforce git 2.0 default behavior for consistency
	default = simple
	followTags = true

[alias]
	tlog = log --pretty=terse

# A gross fix for the fact that I need two different [user] blocks depending on
# what system I'm on. The local file will only contian [user].
# On the plus side, lacking it should cause git to fatal so I never miss it.
[include]
	path = ~/.gitconfig.local
[init]
	defaultBranch = main