gitconfig

[user]
	name = Johnathan Gilday
	email = me@johnathangilday.com
	signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0+jzHG64Byg89pgWUclzk12nmMwRxCNWnhVWhOx4Og
[alias]
	amend = commit --amend --no-edit
	force-pull = "!git fetch ; git reset --hard @{u}"
	s = status
	yeet = push --force-with-lease

[color]
	ui = true

[push]
	default = simple
	autoSetupRemote = true

[core]
	ignorecase = false

[credential]
	helper = cache --timeout=300

[merge]
	tool = kdiff3

[mergetool "kdiff3"]
	path = kdiff3
	trustExitCode = false
	keepBackup = false

[mergetool "meld"]
	trustExitCode = false
	cmd = meld $LOCAL $BASE $REMOTE -o $MERGED --auto-merge

[pull]
	rebase = true

[init]
	defaultBranch = main


# signed commits

[gpg]
	format = ssh

[gpg "ssh"]
	program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
	allowedSignersFile = ~/.ssh/allowed_signers

[commit]
	gpgsign = true


[includeIf "gitdir:github/openpixee/"]
	path = ~/.gitconfig-pixee
[includeIf "gitdir:github/pixee/"]
	path = ~/.gitconfig-pixee