.gitconfig

[color]
	branch = auto
	diff = auto
	status = auto
[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green
[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold
[color "status"]
	added = yellow
	changed = green
	untracked = cyan
[alias]
	st = status
	diff = diff -b
	ci = commit
	br = branch
	co = checkout
	df = diff
	lg = log -p
	who = shortlog -s --
	lc = log ORIG_HEAD.. --stat --no-merges
	llog = log --date=local
	gitkconflict = !gitk --left-right HEAD...MERGE_HEAD
	edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
	add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
	springclean = "!git remote prune origin && git gc"
	k = !gitk
	cleanse=clean -d -f
	pa = add --patch
	join = merge --no-ff
	aliases = !git config --get-regexp 'alias.*'|colrm 1 6|sed 's/[ ]/ = /'
     up = !sh -c 'git pull --rebase --prune && git log --pretty=format:\"%Cred%ae %Creset- %C(yellow)%s %Creset(%ar)\" HEAD@{1}..'
[core]
	editor = vim
[pack]
	threads = 0
[remote "origin"]
	push = HEAD
[branch]
	autosetupmerge = true