dotfiles/common/git/config

[push]
	default = current

[user]
	name = Daniel Flanagan
	email = daniel@lyte.dev

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

[core]
	editor = nvim
	excludesfile = /home/daniel/.home/.gitignore

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

[diff]
	tool = nvimdiff

[difftool]
	prompt = false

[alias]
	a = add
	A = add -A
	ac = commit -a
	b = rev-parse --symbolic-full-name HEAD
	c = commit
	cm = commit -m
	cnv = commit --no-verify
	co = checkout
	d = diff
	ds = diff --staged
	dt = difftool
	f = fetch
	l = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate
	graph = log --graph --abbrev-commit --decorate --oneline --all
	ls = ls-files
	mm = merge master
	p = push
	pf = push --force-with-lease
	pl = pull
	rim = rebase -i master
	s = status
	sur = submodule update --remote

[merge]
	tool = nvimdiff
	conflictstyle = diff3

[mergetool]
	prompt = false

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

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

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

[commit]
	gpgsign = true

[gpg]
	program = gpg2

[include]
	path = $ENV_PATH/gitconfig
[color]
	ui = auto

# This next lines include Netlify's Git Credential Helper configuration in your Git configuration.
[include]
  path = /home/daniel/.home/.netlify/helper/git-config
[init]
	defaultBranch = master
[branch]
	autoSetupMerge = always