Repository navigation
Expand file tree
/
Copy pathconfig
More file actions
242 lines (196 loc) · 6.44 KB
/
Copy pathconfig
File metadata and controls
242 lines (196 loc) · 6.44 KB
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
[user]
name = Dolev Hadar
email = dolev@komodor.io
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcfOgk+7fVQNwnD3WQBUnABIBGO8k7YwUN/WWGCfSEz
[includeIf "gitdir:~/dotfiles/"]
path = config-personal
[includeIf "gitdir:~/code/personal/"]
path = config-personal
[includeIf "gitdir:~/code/komodor/"]
path = config-komodor
[credential]
helper = osxkeychain
helper =
helper = /usr/local/share/gcm-core/git-credential-manager
[credential "https://github.com"]
username = dlvhdr
[gpg]
format = ssh
[commit]
gpgsign = true
[credential "https://dev.azure.com"]
useHttpPath = true
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
[tag]
gpgsign = true
[format]
signOff = false
[pull]
ff = only
rebase = true
[blame]
date = relative
coloring = highlightRecent
[rebase]
updateRefs = true
[push]
default = current
autoSetupRemote = true
[core]
excludesfile = ~/.config/git/ignore
ignorecase = false
pager = delta
[help]
; Autocorrect mistyped commands.
autocorrect = 1
[rerere]
; Remember my merges
enabled = true
[pager]
diff = delta
log = delta
reflog = delta
show = delta
difftool = true
branch =
[fetch]
prune = true
[diff]
colorMoved = default
algorithm = histogram
[branch]
sort = -committerdate
[difftool]
tool = nvimdiff
prompt = false
[difftool "vscode"]
cmd = "code --wait --diff $LOCAL $REMOTE"
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[interactive]
diffFilter = delta --color-only
[add.interactive]
useBuiltin = false ; required for git 2.37.0
[merge]
tool = nvimdiff
conflictstyle = diff3
[mergetool]
keepBackup = false
[mergetool "nvimdiff"]
cmd = nvim -d $MERGED $LOCAL $BASE $REMOTE -c '$wincmd J' -c 'wincmd ='
[mergetool "fugitive"]
cmd = nvim -f -c "Gvdiffsplit!" "$MERGED"
[advice]
statusHints = false
[pull]
rebase = true
[log]
decorate = auto
abbrevCommit = true
showSignature = false
[alias]
aliases = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\ \t => \\2/' | sort
commit = commit -s
s = !git checkout $(git remote show origin | awk '/HEAD branch/ {print $NF}') && git pull && git clean-branches
st = status
ca = !git add -A && git commit
c = commit -m
aa = add -A
amend-all = !git add -A && git commit --amend --no-verify
commit-all = !git add -A && git commit --no-verify
co = checkout
pr = !gh pr
prv = !gh pr view
prvw = !gh pr view -w
prs = !gh pr status
prls = !gh pr list --author=@me
l = !gt l
ls = !gt ls
stack = !gt stack
fix = !gt stack fix --rebase
nuke = clean -f -d
clean-branches = !git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D
update-master = !git checkout master && git pull --rebase && git merge origin/master --ff-only
sync = !gt sync
branches = branch --sort=-authordate
stashes = stash list
remotes = remote -v
conflicts = !git --no-pager diff --name-only --diff-filter=U | xargs grep -c '^=======$'
unstage = reset -q HEAD --
uncommit = reset --mixed HEAD~
master = !git checkout $(git remote show origin | awk '/HEAD branch/ {print $NF}')
main = master
rblame = !git blame -w -M -C -C -C
; Delete local branches that no longer exist on the remote
gone = !git fetch -p && git branch -vv | grep 'origin/.*: gone]' | awk '{print $1}' | xargs git branch -D
; Rebase interactive for all commits on feature branch
rebase-branch = !git rebase -i --onto master `git rev-parse --abbrev-ref HEAD`~1
; preferred git log view
lg = log --graph --abbrev-commit --decorate --format=format:'%C(yellow)%h%C(reset) %C(white)%s%C(reset) %C(dim white)-%C(reset) %ar %C(dim white)<%an>%C(reset)%C(auto)%d%C(reset)' --all
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(yellow)%h%C(reset) %C(white)%s%C(reset) %C(dim white)-%C(reset) %ar %C(dim white)<%an>%C(reset)%C(auto)%d%C(reset)%n' --all --stat
; review
review-base = !git merge-base HEAD \"${review_base:-origin/master}\"
files = !git diff --name-only $(git review-base)
stat = !git diff --stat $(git review-base)
pr-summary = !git log --reverse --format=\"- **%s** (%h)%n%n%w(74,2,2)%b\" \"${review_base:-origin/master}\"..HEAD
depgraph = !git madge image --webpack-config config/webpack.config.babel.js --basedir . --style solarized-dark src
review = !$EDITOR $(git files) +\"bufdo Gitsigns diffthis master\"
reviewone = !$EDITOR -p +\"tabdo Gdiff ${review_base:-origin/master}\" +\"let g:gitgutter_diff_base = '${review_base:-origin/master}'\"
reviewf = !$EDITOR -p $(git files | fzf -m --reverse --height 40%) +\"tabdo Gdiff ${review_base:-origin/master}\" +\"let g:gitgutter_diff_base = '${review_base:-origin/master}'\"
root = !cd $(git rev-parse --show-toplevel)
yolo = !git commit -m "$(curl -s https://whatthecommit.com/index.txt)"
[color]
pager = true
ui = true
status = auto
diff = auto
branch = auto
showBranch = auto
interactive = auto
grep = auto
[color "status"]
added = green
changed = yellow
untracked = red dim
header = dim white
branch = cyan
nobranch = red
[color "branch"]
current = green bold
local = yellow dim
remote = blue
[color "decorate"]
branch = blue
remoteBranch = magenta
tag = magenta
stash = cyan
HEAD = blue
[color "interactive"]
prompt = red
header = red bold
error = red
help = black bold
[color "blame"]
highlightRecent = 237, 20 month ago, 238, 19 month ago, 239, 18 month ago, 240, 17 month ago, 241, 16 month ago, 242, 15 month ago, 243, 14 month ago, 244, 13 month ago, 245, 12 month ago, 246, 11 month ago, 247, 10 month ago, 248, 9 month ago, 249, 8 month ago, 250, 7 month ago, 251, 6 month ago, 252, 5 month ago, 253, 4 month ago, 254, 3 month ago, 231, 2 month ago, 230, 1 month ago, 229, 3 weeks ago, 228, 2 weeks ago, 227, 1 week ago, 226
[delta]
syntax-theme = tokyonight_night
navigate = true
dark = true
side-by-side = false
file-modified-label = modified:
features = unobtrusive-line-numbers decorations
[delta "decorations"]
file-style = bold yellow ul
file-decoration-style = ul "#555555"
hunk-header-decoration-style = omit
commit-decoration-style = none
[delta "unobtrusive-line-numbers"]
line-numbers = true
line-numbers-minus-style = "#3d4163"
line-numbers-zero-style = "#3d4163"
line-numbers-plus-style = "#3d4163"
line-numbers-left-style = "#3d4163"
line-numbers-right-style = "#3d4163"
line-numbers-left-format = "{nm:>4}│"
line-numbers-right-format = "{np:>4}│"