-
-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
166 lines (146 loc) · 4.4 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
[core]
excludesfile = ~/.gitignore.global
whitespace = space-before-tab,trailing-space
pager = delta
editor = vim
[interactive]
diffFilter = delta --color-only --features=interactive
[user]
name = Bence Nagy
email = [email protected]
signingkey = 88D12683EFF2E23E
[init]
defaultBranch = main
[pull]
default = current
rebase = true
[push]
default = current
[commit]
gpgsign = false
[rebase]
autosquash = true
[rerere]
enabled = true
[diff]
compactionHeuristic = true
colorMoved = default
[help]
autocorrect = 5
[merge]
conflictstyle = diff3
tool = code
[mergetool "code"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[color]
ui = true
[gpg]
program = gpg
[include]
path = .gitconfig.prefer-ssh
[submodule]
recurse = true
fetchJobs = 50
[alias]
amend = commit --amend --no-edit
force = push --force-with-lease
unstage = reset HEAD --
add-s = !zsh -c 'git diff -w --no-color "$@" | git apply --cached --ignore-whitespace' -
review = !git-review-pr
a = add
aa = add . -A
ap = add --patch
bl = blame
c = commit
ca = commit -a
cm = commit -m
cam = commit -am
ch = checkout
chb = checkout -b
cl = clone
cp = cherry-pick
cpa = cherry-pick --abort
cpc = cherry-pick --continue
cps = cherry-pick --skip
d = diff
dc = diff --cached
f = fetch
fo = fetch origin
fu = fetch upstream
l = log
lo = log --oneline
p = pull --rebase --autostash
pt = push --tags
t = tag
s = status
sh = show
r = rebase
rom = rebase origin/main
rum = rebase upstream/main
rod = rebase origin/develop
rud = rebase upstream/develop
riom = rebase --interactive origin/main
rium = rebase --interactive upstream/main
riod = rebase --interactive origin/develop
riud = rebase --interactive upstream/develop
rh = reset HEAD
ri = rebase --interactive
ra = rebase --abort
rc = rebase --continue
rs = rebase --skip
upstream = remote add upstream
pop = stash pop
drop = stash drop
af = !zsh -c 'git amend && git force'
aaf = !zsh -c 'git aa && git amend && git force'
forom = !zsh -c 'git fo && git rom'
furum = !zsh -c 'git fu && git rum'
forod = !zsh -c 'git fo && git rod'
furud = !zsh -c 'git fu && git rud'
foriom = !zsh -c 'git fo && git riom'
furium = !zsh -c 'git fu && git rium'
foriod = !zsh -c 'git fo && git riod'
furiud = !zsh -c 'git fu && git riud'
sforom = !zsh -c 'git stash && git fo && git rom && git pop'
sfurum = !zsh -c 'git stash && git fu && git rum && git pop'
sforod = !zsh -c 'git stash && git fo && git rod && git pop'
sfurud = !zsh -c 'git stash && git fu && git rud && git pop'
sforiom = !zsh -c 'git stash && git fo && git riom && git pop'
sfurium = !zsh -c 'git stash && git fu && git rium && git pop'
sforiod = !zsh -c 'git stash && git fo && git riod && git pop'
sfuriud = !zsh -c 'git stash && git fu && git riud && git pop'
set-upstream = !git branch --set-upstream-to=origin/$(git symbolic-ref --short HEAD)
[delta]
width = variable
navigate = true # use n and N to move between diff sections
keep-plus-minus-markers = true
# author: https://github.com/Kr1ss-XD
commit-decoration-style = 232 130 box
commit-style = 232 bold italic 130
dark = true
file-added-label = [+]
file-copied-label = [C]
file-decoration-style = "#606018" overline
file-modified-label = [M]
file-removed-label = [-]
file-renamed-label = [R]
file-style = 232 bold 184
hunk-header-decoration-style = none
hunk-header-style = syntax bold italic 237
line-numbers = true
line-numbers-left-format = "{nm:>1}┊"
line-numbers-left-style = red
line-numbers-minus-style = red italic black
line-numbers-plus-style = green italic black
line-numbers-right-format = "{np:>1}┊"
line-numbers-right-style = green
line-numbers-zero-style = "#545474" italic
minus-emph-style = syntax bold "#780000"
minus-style = syntax "#400000"
plus-emph-style = syntax bold "#007800"
plus-style = syntax "#004000"
syntax-theme = Vibrant Sunburst
whitespace-error-style = "#280050" reverse
zero-style = syntax
blame-format = "{author:<18} ({commit:>7}) ┊{timestamp:^16}┊ "
blame-palette = "#101010 #200020 #002800 #000028 #202000 #280000 #002020 #002800 #202020"