-
Notifications
You must be signed in to change notification settings - Fork 0
/
.git-alias
329 lines (327 loc) · 13.6 KB
/
.git-alias
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
327
328
329
alias ga='git add'
alias gaa='git add --all'
alias gam='git am'
alias gama='git am --abort'
alias gamc='git am --continue'
alias gams='git am --skip'
alias gamscp='git am --show-current-patch'
alias gap='git apply'
alias gapa='git add --patch'
alias gapt='git apply --3way'
alias gau='git add --update'
alias gav='git add --verbose'
alias gb='git branch'
alias gbD='git branch -D'
alias gba='git branch -a'
alias gbd='git branch -d'
alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch -d 2>/dev/null'
alias gbl='git blame -b -w'
alias gbnm='git branch --no-merged'
alias gbr='git branch --remote'
alias gbs='git bisect'
alias gbsb='git bisect bad'
alias gbsg='git bisect good'
alias gbsr='git bisect reset'
alias gbss='git bisect start'
alias gc='git commit -v'
alias 'gc!'='git commit -v --amend'
alias gca='git commit -v -a'
alias 'gca!'='git commit -v -a --amend'
alias gcam='git commit -a -m'
alias 'gcan!'='git commit -v -a --no-edit --amend'
alias 'gcans!'='git commit -v -a -s --no-edit --amend'
alias gcas='git commit -a -s'
alias gcasm='git commit -a -s -m'
alias gcb='git checkout -b'
alias gcd="git checkout develop || git checkout dev"
alias gcf='git config --list'
alias gcl='git clone --recurse-submodules'
alias gclean='git clean -id'
alias gcm='git checkout master || git checkout main'
alias gcmsg='git commit -m'
alias 'gcn!'='git commit -v --no-edit --amend'
alias gco='git checkout'
alias gcor='git checkout --recurse-submodules'
alias gcount='git shortlog -sn'
alias gcp='git cherry-pick'
alias gcpa='git cherry-pick --abort'
alias gcpc='git cherry-pick --continue'
alias gcs='git commit -S'
alias gcsm='git commit -s -m'
alias gcss='git commit -S -s'
alias gcssm='git commit -S -s -m'
alias gd='git diff'
alias gdca='git diff --cached'
alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
alias gdcw='git diff --cached --word-diff'
alias gds='git diff --staged'
alias gdt='git diff-tree --no-commit-id --name-only -r'
alias gdup='git diff @{upstream}'
alias gdw='git diff --word-diff'
alias gf='git fetch'
alias gfa='git fetch --all --prune --jobs=10'
alias gfg='git ls-files | grep'
alias gfo='git fetch origin'
alias gg='git gui citool'
alias gga='git gui citool --amend'
alias ggpull='git pull origin "$(git_current_branch)"'
alias ggpush='git push origin "$(git_current_branch)"'
alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
alias ghh='git help'
alias gignore='git update-index --assume-unchanged'
alias gignored='git ls-files -v | grep "^[[:lower:]]"'
alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
alias gl='git pull'
alias glg='git log --stat'
alias glgg='git log --graph'
alias glgga='git log --graph --decorate --all'
alias glgm='git log --graph --max-count=10'
alias glgp='git log --stat -p'
alias glo='git log --oneline --decorate'
alias glod='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'\'
alias glods='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'\'' --date=short'
alias glog='git log --oneline --decorate --graph'
alias gloga='git log --oneline --decorate --graph --all'
alias glol='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'
alias glola='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'' --all'
alias glols='git log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'' --stat'
alias gluc='git pull upstream $(git_current_branch)'
alias glum='git pull upstream $(git_main_branch)'
alias gm='git merge'
alias gma='git merge --abort'
alias gmom='git merge origin/$(git_main_branch)'
alias gmtl='git mergetool --no-prompt'
alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
alias gmum='git merge upstream/$(git_main_branch)'
alias gp='git push'
alias gpd='git push --dry-run'
alias gpf='git push --force-with-lease'
alias gpoat='git push origin --all && git push origin --tags'
alias gpp='git pull origin && git push origin'
alias gpr='git pull --rebase'
alias gpristine='git reset --hard && git clean -dffx'
alias gpsup='git push --set-upstream origin $(git_current_branch)'
alias gpu='git push upstream'
alias gpv='git push -v'
alias gr='git remote'
alias gra='git remote add'
alias grb='git rebase'
alias grba='git rebase --abort'
alias grbc='git rebase --continue'
alias grbd='git rebase $(git_develop_branch)'
alias grbi='git rebase -i'
alias grbm='git rebase $(git_main_branch)'
alias grbo='git rebase --onto'
alias grbom='git rebase origin/$(git_main_branch)'
alias grbs='git rebase --skip'
alias grev='git revert'
alias grh='git reset'
alias grhh='git reset --hard'
alias grm='git rm'
alias grmc='git rm --cached'
alias grmv='git remote rename'
alias groh='git reset origin/$(git_current_branch) --hard'
alias grrm='git remote remove'
alias grs='git restore'
alias grset='git remote set-url'
alias grss='git restore --source'
alias grst='git restore --staged'
alias gru='git reset --'
alias grup='git remote update'
alias grv='git remote -v'
alias gsb='git status -sb'
alias gsd='git svn dcommit'
alias gsh='git show'
alias gsi='git submodule init'
alias gsps='git show --pretty=short --show-signature'
alias gsr='git svn rebase'
alias gss='git status -s'
alias gst='git status'
alias gsta='git stash push'
alias gstaa='git stash apply'
alias gstall='git stash --all'
alias gstc='git stash clear'
alias gstd='git stash drop'
alias gstl='git stash list'
alias gstp='git stash pop'
alias gsts='git stash show --text'
alias gsu='git submodule update'
alias gsw='git switch'
alias gswc='git switch -c'
alias gswd='git switch $(git_develop_branch)'
alias gswm='git switch $(git_main_branch)'
alias gtp='git push --tags origin'
alias gts='git tag -s'
alias gtv='git tag | sort -V'
alias gunignore='git update-index --no-assume-unchanged'
alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
alias gup='git pull --rebase'
alias gupa='git pull --rebase --autostash'
alias gupav='git pull --rebase --autostash -v'
alias gupom='git pull --rebase origin $(git_main_branch)'
alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
alias gupv='git pull --rebase -v'
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'
# version of the git aliasses for the dotfiles
alias da='dotfiles add'
alias daa='dotfiles add --all'
alias dam='dotfiles am'
alias dama='dotfiles am --abort'
alias damc='dotfiles am --continue'
alias dams='dotfiles am --skip'
alias damscp='dotfiles am --show-current-patch'
alias dap='dotfiles apply'
alias dapa='dotfiles add --patch'
alias dapt='dotfiles apply --3way'
alias dau='dotfiles add --update'
alias dav='dotfiles add --verbose'
alias db='dotfiles branch'
alias dbD='dotfiles branch -D'
alias dba='dotfiles branch -a'
alias dbd='dotfiles branch -d'
alias dbl='dotfiles blame -b -w'
alias dbnm='dotfiles branch --no-merged'
alias dbr='dotfiles branch --remote'
alias dbs='dotfiles bisect'
alias dbsb='dotfiles bisect bad'
alias dbsg='dotfiles bisect good'
alias dbsr='dotfiles bisect reset'
alias dbss='dotfiles bisect start'
alias dc='dotfiles commit -v'
alias 'dc!'='dotfiles commit -v --amend'
alias dca='dotfiles commit -v -a'
alias 'dca!'='dotfiles commit -v -a --amend'
alias dcam='dotfiles commit -a -m'
alias 'dcan!'='dotfiles commit -v -a --no-edit --amend'
alias 'dcans!'='dotfiles commit -v -a -s --no-edit --amend'
alias dcas='dotfiles commit -a -s'
alias dcasm='dotfiles commit -a -s -m'
alias dcb='dotfiles checkout -b'
alias dcf='dotfiles config --list'
alias dcl='dotfiles clone --recurse-submodules'
alias dclean='dotfiles clean -id'
alias dcm='dotfiles checkout master'
alias dcmsg='dotfiles commit -m'
alias 'dcn!'='dotfiles commit -v --no-edit --amend'
alias dco='dotfiles checkout'
alias dcor='dotfiles checkout --recurse-submodules'
alias dcount='dotfiles shortlog -sn'
alias dcp='dotfiles cherry-pick'
alias dcpa='dotfiles cherry-pick --abort'
alias dcpc='dotfiles cherry-pick --continue'
alias dcs='dotfiles commit -S'
alias dcsm='dotfiles commit -s -m'
alias dcss='dotfiles commit -S -s'
alias dcssm='dotfiles commit -S -s -m'
alias dd='dotfiles diff'
alias ddca='dotfiles diff --cached'
alias ddct='dotfiles describe --tags $(dotfiles rev-list --tags --max-count=1)'
alias ddcw='dotfiles diff --cached --word-diff'
alias dds='dotfiles diff --staged'
alias ddt='dotfiles diff-tree --no-commit-id --name-only -r'
alias ddup='dotfiles diff @{upstream}'
alias ddw='dotfiles diff --word-diff'
alias dfa='dotfiles fetch --all --prune --jobs=10'
alias dfg='dotfiles ls-files | grep'
alias dfo='dotfiles fetch origin'
alias dg='dotfiles gui citool'
alias dga='dotfiles gui citool --amend'
alias dgpull='dotfiles pull origin "$(dotfiles_current_branch)"'
alias dgpush='dotfiles push origin "$(dotfiles_current_branch)"'
alias dgsup='dotfiles branch --set-upstream-to=origin/$(dotfiles_current_branch)'
alias dhh='dotfiles help'
alias dignore='dotfiles update-index --assume-unchanged'
alias dignored='dotfiles ls-files -v | grep "^[[:lower:]]"'
alias dotfiles-svn-dcommit-push='dotfiles svn dcommit && dotfiles push dotfileshub $(dotfiles_main_branch):svntrunk'
alias dl='dotfiles pull'
alias dlg='dotfiles log --stat'
alias dlgg='dotfiles log --graph'
alias dlgga='dotfiles log --graph --decorate --all'
alias dlgm='dotfiles log --graph --max-count=10'
alias dlgp='dotfiles log --stat -p'
alias dlo='dotfiles log --oneline --decorate'
alias dlod='dotfiles log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'\'
alias dlods='dotfiles log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'\'' --date=short'
alias dlog='dotfiles log --oneline --decorate --graph'
alias dloga='dotfiles log --oneline --decorate --graph --all'
alias dlol='dotfiles log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'
alias dlola='dotfiles log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'' --all'
alias dlols='dotfiles log --graph --pretty='\''%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'\'' --stat'
alias dluc='dotfiles pull upstream $(dotfiles_current_branch)'
alias dlum='dotfiles pull upstream $(dotfiles_main_branch)'
alias dm='dotfiles merge'
alias dma='dotfiles merge --abort'
alias dmom='dotfiles merge origin/$(dotfiles_main_branch)'
alias dmtl='dotfiles mergetool --no-prompt'
alias dmtlvim='dotfiles mergetool --no-prompt --tool=vimdiff'
alias dmum='dotfiles merge upstream/$(dotfiles_main_branch)'
alias dp='dotfiles push'
alias dpd='dotfiles push --dry-run'
alias dpf='dotfiles push --force-with-lease'
alias dpoat='dotfiles push origin --all && dotfiles push origin --tags'
alias dpp='dotfiles pull origin && dotfiles push origin'
alias dpr='dotfiles pull --rebase'
alias dpristine='dotfiles reset --hard && dotfiles clean -dffx'
alias dpu='dotfiles push upstream'
alias dpv='dotfiles push -v'
alias dr='dotfiles remote'
alias dra='dotfiles remote add'
alias drb='dotfiles rebase'
alias drba='dotfiles rebase --abort'
alias drbc='dotfiles rebase --continue'
alias drbd='dotfiles rebase $(dotfiles_develop_branch)'
alias drbi='dotfiles rebase -i'
alias drbm='dotfiles rebase $(dotfiles_main_branch)'
alias drbo='dotfiles rebase --onto'
alias drbom='dotfiles rebase origin/$(dotfiles_main_branch)'
alias drbs='dotfiles rebase --skip'
alias drev='dotfiles revert'
alias drh='dotfiles reset'
alias drhh='dotfiles reset --hard'
alias drm='dotfiles rm'
alias drmc='dotfiles rm --cached'
alias drmv='dotfiles remote rename'
alias droh='dotfiles reset origin/$(dotfiles_current_branch) --hard'
alias drrm='dotfiles remote remove'
alias drs='dotfiles restore'
alias drset='dotfiles remote set-url'
alias drss='dotfiles restore --source'
alias drst='dotfiles restore --staged'
alias dru='dotfiles reset --'
alias drup='dotfiles remote update'
alias drv='dotfiles remote -v'
alias dsb='dotfiles status -sb'
alias dsd='dotfiles svn dcommit'
alias dsh='dotfiles show'
alias dsi='dotfiles submodule init'
alias dsps='dotfiles show --pretty=short --show-signature'
alias dsr='dotfiles svn rebase'
alias dss='dotfiles status -s'
alias dst='dotfiles status'
alias dsta='dotfiles stash push'
alias dstaa='dotfiles stash apply'
alias dstall='dotfiles stash --all'
alias dstc='dotfiles stash clear'
alias dstd='dotfiles stash drop'
alias dstl='dotfiles stash list'
alias dstp='dotfiles stash pop'
alias dsts='dotfiles stash show --text'
alias dsu='dotfiles submodule update'
alias dsw='dotfiles switch'
alias dswc='dotfiles switch -c'
alias dswd='dotfiles switch $(dotfiles_develop_branch)'
alias dswm='dotfiles switch $(dotfiles_main_branch)'
alias dtp='dotfiles push --tags origin'
alias dts='dotfiles tag -s'
alias dtv='dotfiles tag | sort -V'
alias dunignore='dotfiles update-index --no-assume-unchanged'
alias dunwip='dotfiles log -n 1 | grep -q -c "\-\-wip\-\-" && dotfiles reset HEAD~1'
alias dup='dotfiles pull --rebase'
alias dupa='dotfiles pull --rebase --autostash'
alias dupav='dotfiles pull --rebase --autostash -v'
alias dupom='dotfiles pull --rebase origin $(dotfiles_main_branch)'
alias dupomi='dotfiles pull --rebase=interactive origin $(dotfiles_main_branch)'
alias dupv='dotfiles pull --rebase -v'
alias dwch='dotfiles whatchanged -p --abbrev-commit --pretty=medium'
alias dwip='dotfiles add -A; dotfiles rm $(dotfiles ls-files --deleted) 2> /dev/null; dotfiles commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'