.gitconfig

[user]
	email = johan@duh.se
	name = Johan Eckerström

[i18n]
	commitencoding = UTF-8

[branch]
	autosetupmerge = true
	autosetuprebase = always

[branch "master"]
	remote = origin
	merge = refs/heads/master

[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

[color]
	ui = true

[core]
	whitespace = trailing-space,space-before-tab
	excludesfile = ~/.gitignore

[alias]
	track = !sh -c 'git branch --track "$0" "origin/$0" && git checkout "$0"'
	st = status -sb
	ci = commit -m
	br = branch
	co = checkout
	up = pull --tags origin master
	pu = push --tags origin master
	log = log --topo-order --decorate
	addp = add --patch
	pull = pull --ff-only
[push]
	default = tracking
[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
	tool = Kaleidoscope
[difftool]
	prompt = false
[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustExitCode = true
[mergetool]
	prompt = false
[merge]
	tool = Kaleidoscope