-
Notifications
You must be signed in to change notification settings - Fork 18
/
.gitconfig
181 lines (133 loc) · 4.58 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
# ██ ██ ████ ██
# █████ ░░ ░██ ░██░ ░░ █████
# ██░░░██ ██ ██████ █████ ██████ ███████ ██████ ██ ██░░░██
# ░██ ░██░██░░░██░ ██░░░██ ██░░░░██░░██░░░██░░░██░ ░██░██ ░██
# ░░██████░██ ░██ ░██ ░░ ░██ ░██ ░██ ░██ ░██ ░██░░██████
# ░░░░░██░██ ░██ ░██ ██░██ ░██ ░██ ░██ ░██ ░██ ░░░░░██
# █████ ░██ ░░██ ░░█████ ░░██████ ███ ░██ ░██ ░██ █████
# ░░░░░ ░░ ░░ ░░░░░ ░░░░░░ ░░░ ░░ ░░ ░░ ░░░░░
[user]
name = Brad Parbs
email = [email protected]
github = bradp
signingKey = 1C711FC4DC10B17E
[alias]
a = add
aa = !git add -u && git add . && git status
amend = commit --amend --reuse-message=HEAD
s = status
st = status -sb
c = commit
ci = commit
cl = clone
co = checkout
cob = checkout -b
br = branch
cp = cherry-pick
diff = diff --word-diff
unstage = reset HEAD --
undo = reset --soft HEAD^
ls = log --pretty=log --decorate
ll = log --pretty=log --decorate --numstat
lg = log --pretty=graph --color --graph --abbrev-commit
dl = ll -1
tig = !tig $@
[advice]
statusHints = false
detachedHead = false
waitingForEditor = false
addEmptyPathspec = false
[branch]
autosetupmerge = true
[color "branch"]
current = red reverse
local = blue
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[commit]
gpgSign = true
[core]
editor = vim
excludesfile = /Users/brad/dotfiles/.global_ignore
preloadindex = true
abbrev = 12
[credential]
helper = osxkeychain
[delta]
features = syntax line-numbers
syntax-theme = "Monokai (SL)"
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
hunk-header-style = bold purple
hunk-header-decoration-style = cyan box ul
line-numbers-left-style = cyan
line-numbers-right-style = cyan
line-numbers-minus-style = 124
line-numbers-plus-style = 28
line-numbers-left-format = "{nm:^4}│"
minus-style = bright-red
minus-non-emph-style = bright-red
minus-emph-style = bold ul brightred "#901011"
minus-empty-line-marker-style = red brightred
; minus-style = brightred
; minus-empty-line-marker-style = red brightred
; minus-emph-style = brightred bold ul auto
plus-style = brightgreen
plus-non-emph-style = brightgreen
plus-emph-style = bold ul brightgreen "#006000"
plus-empty-line-marker-style = green brightgreen
whitespace-error-style = reverse purple
; plus-empty-line-marker-style = green brightgreen
; plus-emph-style = brightgreen bold ul auto
whitespace-error-style = 22 reverse
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[gitcvs]
commitMsgAnnotation = ""
[gpg]
program = /usr/local/MacGPG2/bin/gpg
[help]
autocorrect = 1
format = html
[init]
defaultBranch = main
[interactive]
diffFilter = delta --color-only
[merge]
tool = Kaleidoscope
[mergetool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[pager]
diff = delta
reflog = delta
# show = delta
[pretty]
log = "%C(yellow)%h%Cred%d %Creset%s%Cblue [%cn]"
graph = "%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset"
[pull]
rebase = true
[push]
default = current
[status]
showUntrackedFiles = all
[tag]
forceSignAnnotated = true
gpgSign = true
[url "ssh://[email protected]/"]
insteadOf = https://github.com/