.gitconfig

# vim: set noexpandtab:

[user]
	email = kfunk@kde.org
	name = Kevin Funk

[pull]
	rebase = true

[push]
	default = current

[color]
	ui = true

[apply]
	whitespace = fix

[diff "odf"]
	textconv=odt2txt

[merge]
	tool = kdiff3
	guitool = kdiff3

[commit]
	template = ~/.commit-template
	status = on

[alias]
	b = checkout -b
	c = checkout
	coam = commit --amend
	coup = commit --amend --no-edit
	d = diff --exit-code
	dt = difftool --dir-diff
	f = fetch --all
	i = rebase -i
	l = log --graph \
	    --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %C(green)(%cr)%Creset %C(bold blue)<%an>%Creset' \
	    --abbrev-commit --date=relative
	lo = log -u --stat
	r = pull --rebase
	s = status -uno
	up = !git fetch --all && git stash && git pull --rebase && git stash pop

	pushall = !git remote | xargs -n1 git push
	pushalltags = !git remote | xargs -n1 git push --tags
	prunetags = !git tag -l | xargs git tag -d && git fetch -t

	add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
	edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"

	edit-last-commit = !vim `git diff-tree -r --name-only HEAD HEAD~1`

#	post-review = !post-review -o --guess-summary --guess-description
	post-review = rebase -i -x \"arc diff --head HEAD HEAD~1 && arc amend\"
	outgoing = log @{u}..
	incoming = log ..@{u}

	reset-to-upstream = reset --hard @{upstream}

# more aliases: http://www.jukie.net/~bart/conf/gitconfig

# URL rewrites
[url "git://anongit.kde.org/"]
	insteadOf = kde:
[url "ssh://git@git.kde.org/"]
	pushInsteadOf = kde:
	pushInsteadOf = git://anongit.kde.org/
	pushInsteadOf = git://anongit1.kde.org/
[url "git@git.kde.org:"]
	pushInsteadOf = kde:
[url "git://github.com/"]
	insteadOf = "github:"
[url "git@github.com:"]
	pushInsteadOf = "github:"
	pushInsteadOf = "git://github.com/"
[url "git@gitorious.org:"]
	pushInsteadOf = git://gitorious.org/
[url "ssh://krf@codereview.qt-project.org:29418/"]
	insteadOf = "qt:"

[rebase]
	autostash = true
	stat = true

[include]
	path = ~/.gitconfig-private

[rerere]
	enabled = true
[init]
	templatedir = ~/.git-templates
[core]
	attributesfile = ~/.gitattributes_global
[merge "ours"]
	driver = true