-
Notifications
You must be signed in to change notification settings - Fork 520
/
.gitconfig
326 lines (267 loc) · 9.65 KB
/
.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
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
[alias]
# View abbreviated SHA, description, and history graph of the latest 20 commits
l = log --pretty=oneline -n 20 --graph --abbrev-commit
# View the current working tree status using the short format
s = status -s
# Show the diff between the latest commit and the current state
d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
# `git di $number` shows the diff between the state `$number` revisions ago and the current state
di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
# Pull in remote changes for the current repository and all its submodules
p = !"git pull; git submodule foreach git pull origin master"
# Checkout a pull request from origin (of a github repository)
pr = !"pr() { git fetch origin pull/$1/head:pr-$1; git checkout pr-$1; }; pr"
# Clone a repository including all submodules
c = clone --recursive
# Commit all changes
ca = !git add -A && git commit -av
# Switch to a branch, creating it if necessary
go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
# Color graph log view
graph = log --graph --color --pretty=format:"%C(yellow)%H%C(green)%d%C(reset)%n%x20%cd%n%x20%cn%x20(%ce)%n%x20%s%n"
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch -a
remotes = remote -v
# Amend the currently staged files to the latest commit
amend = commit --amend --reuse-message=HEAD
# Credit an author on the latest commit
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
# Interactive rebase with the given number of latest commits
reb = "!r() { git rebase -i HEAD~$1; }; r"
# Find branches containing commit
fb = "!f() { git branch -a --contains $1; }; f"
# Find tags containing commit
ft = "!f() { git describe --always --contains $1; }; f"
# Find commits by source code
fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
# Find commits by commit message
fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
# Remove branches that have already been merged with master
# a.k.a. ‘delete merged’
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d; git remote -v update -p"
# List contributors with number of commits
contributors = shortlog --summary --numbered
lg = log --color --decorate --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an (%G?)>%Creset' --abbrev-commit
mdiff = "!f() { git stash | head -1 | grep -q 'No local changes to save'; x=$?; git merge --no-commit $1 &>/dev/null; git add -u &>/dev/null; git diff --staged; git reset --hard &>/dev/null; test $x -ne 0 && git stash pop &>/dev/null; }; f"
# Codereview aliases
change = codereview change
gofmt = codereview gofmt
mail = codereview mail
pending = codereview pending
submit = codereview submit
sync = codereview sync
# from seth vargo https://gist.github.com/sethvargo/6b2f7b592853381690bfe3bd00947e8f
unreleased = "!f() { git fetch --tags && git diff $(git tag | tail -n 1); }; f"
up = !git pull origin master && git remote prune origin && git submodule update --init --recursive
undo = !git reset HEAD~1 --mixed
top = !git log --format=format:%an | sort | uniq -c | sort -r | head -n 20
# from trevor bramble https://twitter.com/TrevorBramble/status/774292970681937920
alias=!git config -l | grep ^alias | cut -c 7- | sort
# from myles borins https://github.com/TheAlphaNerd/Dot-files/blob/master/.gitconfig
# github broke some workflow... this will make it less painful
patchit = "!f() { echo $1.patch | sed s_pull/[0-9]*/commits_commit_ | xargs curl -L | git am --whitespace=fix; }; f"
# patchit = "!f() { curl -L $1.patch | git am --whitespace=fix; }; f"
patchit-please = "!f() { echo $1.patch | sed s_pull/[0-9]*/commits_commit_ | xargs curl -L | git am -3 --whitespace=fix; }; f"
# patchit-please = "!f() { curl -L $1.patch | git am -3 --whitespace=fix; }; f"
[apply]
# Detect whitespace errors when applying a patch
whitespace = fix
[core]
# Use custom `.gitignore` and `.gitattributes`
excludesfile = ~/.gitignore
attributesfile = ~/.gitattributes
# Treat spaces before tabs and all kinds of trailing whitespace as an error
# [default] trailing-space: looks for spaces at the end of a line
# [default] space-before-tab: looks for spaces before tabs at the beginning of a line
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
# Make `git rebase` safer on OS X
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false
editor = nvim
[color]
# Use colors in Git commands that are capable of colored output when
# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold # line info
old = red # deletions
new = green # additions
[color "status"]
added = yellow
changed = green
untracked = cyan
[diff]
# Detect copies as well as renames
renames = copies
[help]
# Automatically correct and execute mistyped commands
autocorrect = 1
[merge]
# Include summaries of merged commits in newly created merge commit messages
log = true
[push]
# change to maching for machines with older versions of git 1.x.x
default = simple
autoSetupRemote = true
[url "[email protected]:github"]
insteadOf = "https://github.com/github"
insteadOf = "github:github"
insteadOf = "git://github.com/github"
[url "[email protected]:"]
pushInsteadOf = "https://github.com/"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "[email protected]:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
# Uncomment if you want fetch to also get all github pull requests, this is rather
# large on big repos.
#[remote "origin"]
#fetch = +refs/pull/*/head:refs/remotes/origin/pull/*
[commit]
gpgsign = true
[pull]
rebase = true
[user]
name = Jess Frazelle
email = [email protected]
signingkey = 18F3685C0022BFF3
[github]
user = jessfraz
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[safe]
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
directory = /home/user/src
[init]
defaultBranch = main