gitconfig

[user]
	name = Peter Aronoff
	email = peter@aronoff.org

[alias]
    unmerged = !git branch -r --no-merged | grep -v HEAD | xargs -L1 git --no-pager log --pretty=tformat:'%Cgreen%d%Creset - %h by %an (%Cblue%ar%Creset)' -1
    merged = !git branch -r --merged | grep -v HEAD | xargs -L1 git --no-pager log --pretty=tformat:'%Cgreen%d%Creset - %h by %an (%Cblue%ar%Creset)' -1
	ll = log --pretty=oneline --abbrev-commit --max-count=15
	timelog = log --pretty=format:'%Cred%h%Creset - %C(yellow)%ae%Creset - %Cgreen%cd%Creset - %s%Creset' --abbrev-commit --date=short
	l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
	staged = diff --cached
	unstaged = diff
	current-branch = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
	track = checkout -t
	retrack = "!retrack() { git config \"branch.$1.remote\" $(dirname \"$2\"); git config \"branch.$1.merge\" \"refs/heads/$(basename \"$2\")\"; }; retrack"
	ll = log --pretty=oneline --abbrev-commit --max-count=15
	timelog = log --pretty=format:'%Cred%h%Creset - %C(yellow)%ae%Creset - %Cgreen%cd%Creset - %s%Creset' --abbrev-commit --date=short
	c = rev-parse --short HEAD
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
	find = "!func() { git grep $1 $(git rev-list --all); }; func"
	logger = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
	ctags = !.git/hooks/ctags

[color]
	ui = auto

[branch]
	autosetupmerge = true

[github]
	user = telemachus
	token = <TODO>
	password = <TODO>

[core]
	excludesfile = ~/.gitignore_global
	filemode = true
	logallrefupdates = true
	whitespace = space-before-tab, trailing-space

[diff]
	tool = nvimdiff2

[difftool "nvimdiff2"]
	trustExitCode = true
	cmd = nvim -d $LOCAL $REMOTE

[merge]
	tool = nvimdiff4

[mergetool "nvimdiff4"]
	trustExitCode = true
	cmd = nvim -d $LOCAL $BASE $REMOVE $MERGED -c '$wincmd w' -c 'wincmd J'

[commit]
	verbose = true

[color "diff"]
	meta = blue bold
	frag = magenta bold
	old = red bold
	new = green bold

[color "branch"]
	current = yellow reverse
	local = yellow bold
	remote = green bold
	plain = red bold

[color "status"]
	added = yellow
	changed = green bold
	untracked = blue bold

[init]
	templatedir = ~/.git_template

[credential]
	helper = osxkeychain

[push]
	default = simple

[http]

[diff]
	compactionHeuristic = true

[pull]
	ff = only