.gitconfig

[user]
	name = Tim Burke
	email = tim.burke@gmail.com

[merge]
	tool = kdiff3

[diff]
	compactionHeuristic = true

[mergetool "kdiff3"]
	path = /Applications/kdiff3.app/Contents/MacOS/kdiff3

[difftool "kdiff3"]
	path = /Applications/kdiff3.app/Contents/MacOS/kdiff3

[alias]
	ll = log --pretty='format:%C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
	lrc = log --left-right --pretty='format:%m %C(yellow)%h%Creset %s%C(green bold)%d%Creset %C(black bold)(by %an, %ar)%Creset'
	lc = !sh -c 'git ll origin/HEAD..${1:HEAD}' -
	lcr = !sh -c 'git ll ${1:HEAD}..origin/HEAD' -
	lu = !sh -c 'git ll @{u}..${1:HEAD}' -
	lur = !sh -c 'git ll ${1:HEAD}..@{u}' -
	cv = !git-cherry-view
	bv = branch --color -vvv
	br = branch --contains origin~250 -a --no-merged origin
	v = tag --points-at HEAD
    rv = describe --abbrev=0 --tags
    st = status --short --branch

[color]
	ui = auto

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

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

[color "decorate"]
	branch = green bold
	remoteBranch = green

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

[push]
	default = simple

[diff "ini"]
	xfuncname = "^(\\[.*\\])"

[fetch]
    prune = true

[pull]
    rebase = true

[rebase]
    autoSquash = true
    autoStash = true

[stash]
    showPatch = true