blob: aac8984aeafcbf58405595741d4ad207da377e31 (
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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
[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 diff --color | subdiff | ${PAGER}
ps = !git show --color | subdiff | ${PAGER}
# script to preserve colors
s = !script -c 'git status' /dev/null | grep -ve '^. [(]' -e '^..$' | awk '/^[\"-$] Untracked/{exit}{print $0}'
[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
|
