gitconfig

[alias]
	# shortcuts
	br = branch
	bra = branch -avv
	co = checkout
	cm = cherry -v master
	cp = cherry-pick
	cpc = cherry-pick --continue
	cpo = cherry-pick --strategy=recursive --strategy-option=ours
	cpt = cherry-pick --strategy=recursive --strategy-option=theirs
	cl = clone
	ci = commit
	cia = commit --amend
	conflicts = diff --no-prefix --name-only --diff-filter=U
	db = diff-blame
	di = diff --no-prefix
	dif = diff --no-prefix
	dic = diff --color-words --no-prefix
	dicc = diff --color-words --word-diff-regex=. --no-prefix
	dis = diff --staged --no-prefix
	disc = diff --staged --color-words --no-prefix
	discc = diff --staged --color-words --word-diff-regex=. --no-prefix
	fa = !git fetch --all --prune && git fetch --all --tags
	fb = filter-branch -f --prune-empty
	fbi = filter-branch -f --prune-empty --index-filter
	fbs = filter-branch -f --prune-empty --subdirectory-filter
	fbt = filter-branch -f --prune-empty --tree-filter
	graph = log --date-order --graph --decorate --oneline
	lns = log --name-status
	follow = log --name-status --follow
	lp1 = log -p -1
	lp2 = log -p -2
	lp3 = log -p -3
	lp4 = log -p -4
	lp5 = log -p -5
	lp6 = log -p -6
	lp7 = log -p -7
	lp8 = log -p -8
	lp9 = log -p -9
	ff = merge --ff --ff-only 'HEAD@{u}'
	ffs = !git stash && git ff && git pop
	ls = ls-files
	move = mv
	ren = mv
	rename = mv
	pl = pull
	prb = pull --rebase
	ps = !fix-git-remotes && git push
	psf = push --force
	ra = rebase --abort
	rc = rebase --continue
	ri = rebase -i
	ri1 = rebase -i HEAD~1
	ri2 = rebase -i HEAD~2
	ri3 = rebase -i HEAD~3
	ri4 = rebase -i HEAD~4
	ri5 = rebase -i HEAD~5
	ri6 = rebase -i HEAD~6
	ri7 = rebase -i HEAD~7
	ri8 = rebase -i HEAD~8
	ri9 = rebase -i HEAD~9
	rs = rebase --skip
	ws = rebase --whitespace=strip
	ru = remote update --prune
	rhup = reset --hard 'HEAD@{u}'
	pop = stash pop --index
	st = status
	tags = !git fetch --tags && git tag -l
	list-tags = !git-list-tags
	wiki-clone = clone -c 'remote.origin.mediaimport=true' -c 'remote.origin.mediaexport=true' -c 'remote.origin.namespaces=(Main) File Template'

	# new functions
	fix = !fixup-rebase
	ghr = "!ghr() { git remote set-url origin git://github.com/$1 && git remote set-url --push origin git@github.com:$1; }; ghr"
	pack = !git reset --hard && git for-each-ref --format='%(refname)' refs/original/ | xargs -n 1 git update-ref -d && git reflog expire --expire=now --all && git gc --aggressive --prune=now
	spop = !git checkout 'stash^{tree}' -- . && git stash drop

[core]
	pager = less -FSX

[diff]
	color = auto

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

[http]
	cookiefile = ~/.gitcookies

[push]
	default = upstream

[ui]
	color = auto

[user]
	name = Curtis Rueden
	email = ctrueden@wisc.edu

[rebase]
	autosquash = true