.gitconfig

[alias]
	st = status
	ci = commit
	co = checkout
	ff = !git fetch upstream && git merge --ff-only upstream/master
	cp = cherry-pick
	sp = stash pop
	pu = push -u origin HEAD
	fixup = !sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -
	squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -
	ri = rebase --interactive
	rc = rebase --continue
	br = branch
	brs = for-each-ref --sort=-committerdate --format="%(committerdate:relative)%09%(refname:short)" refs/heads
	tree = log --graph --oneline --decorate --color --all
	tr = log --graph --oneline --decorate --color
	blog = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%an%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
	unpushed = !"PROJ_BRANCH=$(git symbolic-ref HEAD | sed 's|refs/heads/||') && git log origin/$PROJ_BRANCH..HEAD"
	unpulled = !"PROJ_BRANCH=$(git symbolic-ref HEAD | sed 's|refs/heads/||') && git fetch && git log HEAD..origin/$PROJ_BRANCH"
	sta = status -s -b
	me = merge
	fixm = commit --amen
	reauth = commit --amen --reset-author -CHEAD
	redo = commit --amen -CHEAD
	delete-merged = !sh -c '(git fetch -p --all && git branch --merged | grep -v "\\*" | grep -v 'master' | xargs -n1 git branch -d)' -
	bn = !"git name-rev HEAD --name-only | tr -d \"\n\" | pbcopy && echo $(git name-rev HEAD --name-only)"
	pr = "!f() { git fetch ${2:-upstream} refs/pull/$1/head:pr/$1; }; f"
[branch]
	autosetuprebase = always
[color]
	ui = auto
[core]
	excludesfile = ~/.cvsignore
	editor = vim
	whitespace = warn
[help]
	autocorrect = 10
[interactive]
	singlekey = false
[merge]
	summary = true
[push]
	default = tracking
[rebase]
	autosquash = true
[user]
	name = Ryland Herrick
	email = ryalnd@gmail.com
[advice]
	statusHints = false
[credential]
	helper = osxkeychain
[rerere]
	enabled = true
[color "diff"]
	whitespace = red reverse
[pull]
	rebase = true