[alias]
	alias = "!f() { [ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && return 0 || echo \"Usage: git alias <new alias> <original command>\" >&2 && return 1; }; f"
	aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
	b = branch
	branches = branch --all
	cat = cat-file -p
	dump = cat-file -p
	file = cat-file -t
	type = cat-file -t
	camend = commit --amend --no-edit
	checkin = commit
	ci = commit
	co = checkout
	d = diff
	dc = diff --cached
	dshow = show --decorate
	incoming = !git remote update --prune; git log ..@{upstream}
	l = log --decorate
	l1 = log --decorate --oneline
	l5 = log --decorate -5
	lg = log --decorate --graph
	lg1 = log --decorate --graph --oneline
	lg5 = log --decorate --graph -5
	lr = log --decorate --reverse
	lr1 = log --decorate --reverse --oneline
	lr5 = log --decorate --reverse -5
	null-merge = merge --strategy=ours
	outgoing = log @{upstream}..
	push2all = !git remote | xargs -I% -n1 git push %
	remotes = remote -v
	ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{upstream\\}\"}; }; f"
	#root = !pwd
	root = rev-parse --show-toplevel
	st = status --short
	stb = status --short --branch
	tags = tag --list
	unstage = reset HEAD --
	wdiff = diff --word-diff
	wshow = show --word-diff --decorate

[branch]
	autosetuprebase = always

[color]
	ui = auto

[include]
	path = ~/lib/config/git/light_bg

[log]
	abbrevCommit = true

[merge]
	tool = vimdiff

#[mergetool "vimdiff3"]
# Don't forget to add -f for gvim
# 3 way diffs
#	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"

[push]
	default = simple

[receive]
	denyNonFastForwards = true

[web]
	browser = webbrowser

[browser "webbrowser"]
	cmd = webbrowser -n

[gui]
	fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
	fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0