summaryrefslogtreecommitdiffstats
path: root/.gitconfig
blob: ff349272698ab91dc9a8f9a2ff3221cd95cd269e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
[user]
	name = Jan Pokorný
	email = jpokorny@redhat.com

[alias]
	c = commit -s

[core]
	editor = vim

[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
[merge]
	tool = mymeld
	conflictstyle = diff3

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

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