.gitconfig

[user]
	name = Tommy Stanton
	email = tommystanton@gmail.com
[color]
	branch = auto
	status = auto
	diff = auto
[color "diff"]
	whitespace = red reverse
[core]
	editor = /usr/bin/env vim
	pager = less -SRX
	attributesfile = ~/.gitattributes
[diff]
	tool = vimdiff
	renames = true
[difftool "vimdiff"]
	cmd = vimdiff -o $LOCAL $REMOTE
[merge]
	tool = diffconflicts
[branch]
	autosetupmerge = true
[alias]
	current-branch = rev-parse --abbrev-ref HEAD
	cut-from = merge-base origin/master HEAD
	l = log --no-decorate --pretty=oneline --abbrev-commit
	lst = ls-tree --name-only -r
	lsc = diff --name-only --diff-filter=U
	# 'fb': "feature branch"
	# 'np': "not pushed"
	diff-fb = !git diff origin/master...
	l-fb = !git l origin/master..
	l-np = !git l origin/$(git current-branch)..
	log-fb = !git log origin/master..
	log-np = !git log origin/$(git current-branch)..
	rebase-fb = !git rebase -i $(git cut-from)
	# 'gl': GitLab
	ci-gl-wiki = commit --allow-empty-message -m ''
[diff "json"]
	textconv = json-diffable <
[diff "tar"]
	textconv = tar ft
[diff "odf"]
	textconv = odt2txt
[diff "doc"]
	textconv = catdoc
[mergetool]
	keepBackup = false
[pager]
	log = diff-highlight | less
	show = diff-highlight | less
	diff = diff-highlight | less
[mergetool "diffconflicts"]
	cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
	trustExitCode = true
	keepBackup = false
[fetch]
	prune = true
[rebase]
	autosquash = true
[push]
	default = simple
[rerere]
	enabled = true