dotfiles/apps/git/config

[push]
	default = current

[user]
	name = Daniel Flanagan
	email = daniel@lytedev.io
	signingkey = daniel@lytedev.io

[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true

[core]
	editor = nvim

[http "https://gopkg.in"]
	followRedirects = true

[diff]
	tool = cat

[difftool]
	prompt = false

[multidiff]
	tool = nvimdiff -f

[alias]
	d = difftool
	s = status
	co = checkout
	mm = merge master
	rim = rebase -i master
	b = rev-parse --symbolic-full-name HEAD
	p = push
	pl = pull
	pf = push --force-with-lease
	a = add -A
	cnv = commit --no-verify
	canv = commit --no-verify
	c = commit

[merge]
	tool = nvimdiff
	conflictstyle = diff3

[mergetool]
	prompt = false

[mergetool "nvimdiff"]
	cmd = nvimdiff $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd J'

[mergetool "cat"]
	cmd = cat $BASE $LOCAL $REMOTE $MERGED

[mergetool "echo"]
	cmd = echo $BASE $LOCAL $REMOTE $MERGED

[mergetool "vimmultidiff"]
	cmd = vim-multi-diff-builder $BASE $LOCAL $REMOTE $MERGED

[pager]
	branch = false
	# remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding
	# diff = vimpager -c 'silent %sm/\\e[^mK]*[mK]//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent execute \"normal gg2dd\"'
	diff = less

[url "git@github.com:postmates"]
	insteadOf = https://github.com/postmates

[commit]
	gpgsign = true

[gpg]
	program = gpg2