[user]
	name = Jan Pokorný
	email = jpokorny@redhat.com

[alias]
	c = commit -s
	dh = diff HEAD
	wd = diff --word-diff
	swd = show --word-diff
	pd = "!git_pd() {\
	git diff --color \"$@\" | subdiff | ${PAGER};\
	}; git_pd"
	pwd = "!git_pwd() {\
	git wd --color \"$@\" | subdiff | ${PAGER};\
	}; git_pwd"
	ps = "!git_ps() {\
	git show --color \"$@\" | subdiff | ${PAGER};\
	}; git_ps"
	pswd = "!git_pswd() {\
	git swd --color \"$@\" | subdiff | ${PAGER};\
	}; git_pswd"
	# script to preserve colors; quoting is strange, but "just works"
	s = "!git_s() {\
	script -c \"git status \"$@\"\" /dev/null\
	| grep -ve '^.   [(]' -e '^..$'\
	| awk '/^[\"-$] Untracked/{exit}{print $0}';\
	}; git_s"
	wc = whatchanged

[core]
	editor = vim

[push]
	default = simple

[column]
	status = auto

[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

# http://lukas.zapletalovi.com/2012/06/three-way-git-merging-and-meld.html
# -> http://lukas.zapletalovi.com/2012/09/three-way-git-merging-with-meld.html
[merge]
	tool = mymeld
	conflictstyle = diff3

[mergetool "mymeld"]
	cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $BASE $REMOTE $MERGED

[sendemail]
	smtpserver = smtp.corp.redhat.com

[include]
	path = ~/.gitconfig-priv