-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdot.gitconfig
260 lines (229 loc) · 4.98 KB
/
dot.gitconfig
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
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
[user]
name = Jorge Pereira
email = jpereiran@gmail.com
[github]
user = jpereira
token = token
[includeIf "gitdir:~/Devel/FreeRADIUS/**"]
path = .gitconfig-freeradius
[includeIf "gitdir:~/Devel/GNOME/**"]
path = .gitconfig-gnome
[gui]
pruneduringfetch = true
[core]
editor = vim
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
[credential]
helper = cache --timeout=3600
[sendemail]
smtpencryption = tls
smtpserver = smtp.gmail.com
smtpuser = jpereiran@gmail.com
smtppass = *******
smtpserverport = 587
to = git@vger.kernel.org
[web]
browser = google-chrome
[push]
default = current
[gpg]
program = gpg
# sign all commits by default in any local repository
[commit]
gpgsign = true
template = ~/.gitconfig_stCommitMsg
[core]
editor = vim
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore_global
[rerere]
enabled = 1
autoupdate = 1
[rebase]
autosquash = true
[branch]
autosetuprebase = always
[fetch]
prune = true
[alias]
s = status
st = status
sb = status -s -b
cp = cherry-pick
cpc = cherry-pick --continue
cpa = cherry-pick --abort
############
clean-all = clean -fdx
cfdx = clean -fdx
############
sa = stash apply
sc = stash clear
sd = stash drop
sl = stash list
sp = stash pop
ss = stash save
############
d = diff
df = diff
dt = difftool
dfh = diff HEAD
dc = diff --cached
dk = diff --check
dck = diff --cached --check
############
c = commit
ci = commit
cif = commit --fixup
cf = commit --fixup
cinosign = commit --no-gpg-sign
cins = commit --no-gpg-sign
ca = commit -a
cm = commit -m
cam = commit -am
cia = commit --amend
cad = commit -a --amend
############
a = add .
############
ap = apply
as = apply --stat
ac = apply --check
############
l = log --oneline
lg = log --oneline --graph --decorate
ld = log --pretty=format:\"[%h] gpg:%G?, <%ae>, %ar: %s\" --stat
ll = log --graph --decorate --simplify-by-decoration
chlogm = !sh -c 'git log $1...$2 --pretty=format:\"%s [view commit](http://github.com/$3/$4/commit/%H)\"'
# FreeRadius
fr-chlogm = !sh -c 'git log $1...$2 --pretty=format:\"%s [view commit](http://github.com/freeradius/freeradius-server/commit/%H)\"'
############
o = checkout
co = checkout
cov3 = checkout v3.0.x
cov32 = checkout v3.2.x
com = checkout master
ob = checkout -b
############
b = branch
ba = branch -a
bd = branch -d
br = branch -r
############
f = fetch
fo = fetch origin
fa = fetch --all -pn
fapn = fetch --all -pn
############
fp = format-patch
############
fk = fsck
############
m = merge
############
pr = prune -v
############
ps = push
pso = push origin
psof = push origin -f
po = push origin
pof = push origin -f
pom = push origin master
pl = pull
pr = pull --rebase
psf = push -f
psu = push -u
plu = pull -u
pso = push origin
plo = pull origin
pro = pull --rebase origin
pru = pull --rebase upstream
prum = pull --rebase upstream master
pruv4 = pull --rebase upstream master
pruv3 = pull --rebase upstream v3.0.x
pruv32 = pull --rebase upstream v3.2.x
psfo = push -f origin
psuo = push -u origin
pluo = pull -u origin
############
rb = rebase
rb-squash-by-id = rebase -i --autosquash
############
re = reset
rh = reset HEAD
rh1 = reset HEAD^1
undo = reset HEAD^1
reh = reset --hard
rem = reset --mixed
res = reset --soft
rehh = reset --hard HEAD
remh = reset --mixed HEAD
resh = reset --soft HEAD
############
r = remote
ra = remote add
rm = remote rm
rv = remote -v
rp = remote prune
rs = remote show
rso = remote show origin
rpo = remote prune origin
############
w = show
############
human = name-rev --name-only --refs=refs/heads/*
#
# Colors
#
[color]
ui = true
[color "branch"]
current = yellow bold
local = green bold
remote = cyan bold
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = green bold
changed = yellow bold
untracked = red bold
#
# Diff
#
[diff]
tool = meld
# guitool = meld
# tool = "sourcetree"
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
[difftool "meld"]
# trustExitCode = true
# osx
# cmd = open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\" --label \"DIFF (ORIGINAL MY)\"
cmd = open -W -a Meld --args \"$LOCAL\" \"$PWD/$REMOTE\"
# linux
# cmd = meld \"$LOCAL\" \"$PWD/$REMOTE\"
#
# Merge
#
[merge]
tool = meld
# tool = "Sublime Merge"
[mergetool]
prompt = false
[mergetool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\" --label \"DIFF (ORIGINAL MY)\"
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[mergetool "Sublime Merge"]
cmd = smerge mergetool \"$BASE\" \"$REMOTE\" \"$LOCAL\" -o \"$MERGED\"
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process