blob: 6d107db63892aae59b4d98d3931a196c58913aee (
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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
[user]
name = Jan Pokorný
email = jpokorny@redhat.com
[alias]
ai = add -ip
c = commit -s
g = log --grep
gg = log -p --grep
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 -qc \"git status \"$@\"\" /dev/null\
| grep -ve '^. [(]' -e '^..$'\
| awk '/^[\"-$] Untracked/{exit}{print $0}';\
}; git_s"
# git se @<project name or another optional tag> ....
se = "!git_se() {\
local subjpfx=\"PATCH\"; [[ $1 =~ ^@* ]] && subjpfx=\"${1#@}][${subjpfx}\" && shift;\
git send-email --subject-prefix=\"${subjpfx}\" \"$@\";\
}; git_se"
wc = whatchanged
pwc = "!git_pwc() {\
git wc --color \"$@\" | subwc | ${PAGER};\
}; git_pwc"
# http://www.jukie.net/bart/blog/pimping-out-git-log
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' \
--abbrev-commit --date=relative
[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 = black reverse bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[http]
sslCAInfo = /home/jpokorny/.pki/tls/certs/ca-bundle.crt
# 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
|