.gitconfig

[merge]
	conflictStyle = zdiff3
	tool = vimdiff
[mergetool]
	keepBackup = false
	prompt = false
[pull]
	rebase = true
[log]
	abbrevCommit = true
	decorate = auto
[format]
	pretty = oneline
[status]
	short = true
	branch = true
[alias]
	unstage = reset --quiet HEAD
	uncommit = reset --mixed HEAD~
	force-push = push --force-with-lease
        fp = force-push
	br = branch
	ci = commit
	co = checkout
	st = status
	rb = rebase
	cp = cherry-pick
[color]
	ui = true
[user]
	name = Benjamin Darfler
	email = bdarfler@gmail.com
	signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL5CTP1l/0eOPKFFhJDln3a5PiGhj6Bzr2yK9Wd1NFmH
[credential]
	helper = osxkeychain
[user]
[core]
	excludesfile = ~/.gitignore_global
	pager = delta --dark
[interactive]
	diffFilter = delta --dark --color-only
[commit]
	gpgsign = true
[rerere]
	enabled = true
	autoupdate = true
[tag]
	forceSignAnnotated = true
	gpgsign = true
[delta]
	features = side-by-side line-numbers decorations
	whitespace-error-style = 22 reverse
[delta "decorations"]
	commit-decoration-style = bold yellow box ul
	file-style = bold yellow ul
	file-decoration-style = none
[hub]
	protocol = https
[push]
	default = current
	autoSetupRemote = true
[fetch]
	prune = true
[gpg]
	format = ssh
[gpg "ssh"]
	program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
[url "git@github.com:"]
	insteadOf = https://github.com/
[diff]
	algorithm = histogram