-
Notifications
You must be signed in to change notification settings - Fork 323
/
gitalias.txt
1780 lines (1517 loc) · 65.3 KB
/
gitalias.txt
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
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
# -*- mode: gitconfig; -*-
# vim: set filetype=gitconfig:
##
# GitAlias.com collection of many git alias items, including shortcuts,
# helpers, workflows, utilties, visualizers, reports, etc.
#
#
# ## Usage
#
# Usage for a typical user is easy.
#
# Save this file anywhere you want, such as in your home directory,
# such as a file name similar to your git config file name, such as:
#
# ~/.gitalias
#
# Edit your git config dot file, such as:
#
# vi ~/.gitconfig
#
# Include the path to the git alias dot file, such as:
#
# [include]
# path = ~/.gitalias
#
#
# ## Usage for older git versions
#
# If you use an older version of git that does not have git config "include" capability,
# or if you prefer more control, then you can simply copy/paste anything you like from
# this file to your own git config file.
#
#
# ## Customization
#
# If you want to use this file, and also want to change some of the items,
# then one way is to use your git config file to include this gitalias file,
# and also define your own alias items; a later alias takes precedence.
#
# Example git config file:
#
# [include]
# path = ~/.gitalias
#
# [alias]
# l = log --graph --oneline
#
#
# ## Links
#
# * [GitAlias.com website](https://gitalias.com)
# * [Git Alias GitHub](https://github.com/gitalias)
# * [Git Basics - Git Aliases](https://git-scm.com/book/en/v2/Git-Basics-Git-Aliases)
# * [Git Basics - Tips and Tricks](https://git-scm.com/book/en/v1/Git-Basics-Tips-and-Tricks)
#
# ## Tracking
#
# * Package: gitalias
# * Version: 28.0.1
# * Created: 2016-06-17T22:05:43Z
# * Updated: 2023-05-31T11:39:14Z
# * License: GPL-2.0-or-later or contact us for custom license
# * Contact: Joel Parker Henderson (joel@joelparkerhenderson.com)
##
[alias]
##
# Short aliases for frequent commands.
#
# Guidelines: these aliases do not use options, because we want
# these aliases to be easy to compose and use in many ways.
##
a = add
b = branch
c = commit
d = diff
f = fetch
g = grep
l = log
m = merge
o = checkout
p = pull
s = status
w = whatchanged
##
# Short aliases for frequent commands and options.
##
### add aliases ###
## add all
aa = add --all
# add by patch - looks at each change, and asks if we want to put it in the repo.
ap = add --patch
# add just the files that are updated.
au = add --update
### branch aliases ###
# branch and only list branches whose tips are reachable from the specified commit (HEAD if not specified).
bm = branch --merged
# branch and only list branches whose tips are not reachable from the specified commit (HEAD if not specified).
bnm = branch --no-merged
# branch with edit description
bed = branch --edit-description
# branch with show description; ideally git will add this feature in the future as `git --show-description`
bsd = "!f(){ \
branch=\"${1:-$(git current-branch)}\"; \
git config \"branch.$branch.description\"; \
};f"
# branch verbose: When in list mode, show the hash, the commit subject line, etc.
# This is identical to doing `git b -v`.
bv = branch --verbose
# branch verbose verbose: When in list mode, show the hash the commit subject line, the upstream branch, etc.
# This is identical to doing `git b -vv`.
bvv = branch --verbose --verbose
### commit aliases ###
# commit - amend the tip of the current branch rather than creating a new commit.
ca = commit --amend
# commit - amend the tip of the current branch, and edit the message.
cam = commit --amend --message
# commit - amend the tip of the current branch, and do not edit the message.
cane = commit --amend --no-edit
# commit - amend the tip of the current branch, automatically staging files that have been modified and deleted.
caa = commit --amend --all
# commit - amend the tip of the current branch, staging files, and edit the message.
caam = commit --amend --all --message
# commit - amend the tip of the current branch, staging files, and do not edit the message.
caane = commit --amend --all --no-edit
# commit interactive
ci = commit --interactive
# commit with a message
cm = commit --message
### checkout aliases ###
# checkout - update the working tree to match a branch or paths. [same as "o" for "out"]
co = checkout
cong = checkout --no-guess
# create a new branch from the current working tree, and switch to it
cob = checkout -b
### cherry-pick aliases ###
# cherry-pick - apply the changes introduced by some existing commits; useful for moving small chunks of code between branches.
cp = cherry-pick
# cherry-pick - abort the picking process
cpa = cherry-pick --abort
# cherry-pick - continue the picking process
cpc = cherry-pick --continue
# cherry-pick -n a.k.a. without making a commit
cpn = cherry-pick --no-commit
# cherry-pick -n a.k.a. without making a commit, and when when recording the commit, append a line that says "(cherry picked from commit ...)"
cpnx = cherry-pick --no-commit -x
### diff aliases ###
# Show changes not yet staged
dc = diff --cached
# Show changes about to be commited
ds = diff --staged
# Show changes but by word, not line
dw = diff --word-diff
# Show changes with our preferred options; a.k.a. `diff-deep`
dd = diff-deep
### fetch aliases ###
# Fetch all remotes
fa = fetch --all
# Fetch all remotes and use verbose output
fav = fetch --all --verbose
### grep aliases ###
# grep -n means show line number
gn = grep --line-number
# Search with our preferred options; a.k.a. `grep-group`
gg = grep-group
### log aliases ###
# log with a text-based graphical representation of the commit history.
lg = log --graph
# log with one line per item.
lo = log --oneline
# log with one line per item, in reverse order i.e. recent items first.
lor = log --oneline --reverse
# log with patch generation.
lp = log --patch
# log with first parent, useful for team branch that only accepts pull requests
lfp = log --first-parent
# log with items appearing in topological order, i.e. descendant commits are shown before their parents.
lto = log --topo-order
# log list - Show log list with our preferred options, a.k.a. `log-list`
ll = log-list
# log list long - Show log list with our preferred options with long information, a.k.a. `log-list-long`
lll = log-list-long
### ls-files aliases ###
# ls-files - show information about files in the index and the working tree; like Unix "ls" command.
ls = ls-files
# lsd - List files with debug information
lsd = ls-files --debug
# lsfn - List files with full name.
lsfn = ls-files --full-name
# lsio - list files that git has ignored.
#
# git ls-files:
#
# -i, --ignored
# Show only ignored files in the output …
#
# -o, --others
# Show other (i.e. untracked) files in the output …
#
# --exclude-standard
# Add the standard Git exclusions …
#
lsio = ls-files --ignored --others --exclude-standard
### merge aliases ###
# merge abort - cancel the merging process
ma = merge --abort
# merge - continue the merging process
mc = merge --continue
# merge but without autocommit, and with a commit even if the merge resolved as a fast-forward.
mncnf = merge --no-commit --no-ff
### pull aliases ###
# pf - Pull if a merge can be resolved as a fast-forward, otherwise fail.
pf = pull --ff-only
# pp - Pull with rebase in order to provide a cleaner, linear, bisectable history
#
# To automatically do "pull --rebase" everywhere:
#
# git config --global pull.rebase true
#
# To automatically do "pull --rebase" for any branch based on
# the branch "main":
#
# git config branch.main.rebase true
#
# To automatically do "pull --rebase" for any newly-created branches:
#
# git config --global branch.autosetuprebase always
#
# To integrate changes between branches, you can merge or rebase.
#
# When we use "git pull", git does a fetch then a merge.
#
# If we've made changes locally and someone else has pushed changes
# to our git host then git will automatically merge these together
# and create a merge commit that looks like this in the history:
#
# 12345678 - Merge branch 'foo' of bar into main
#
# When we use "git pull --rebase", git does a fetch then a rebase.
# A rebase resets the HEAD of your local branch to be the same as
# the remote HEAD, then replays your local commits back into repo.
# This means you don't get any noisy merge messages in your history.
# This gives us a linear history, and also helps with git bisect.
#
pr = pull --rebase
# prp - Pull with rebase preserve of merge commits
#
# See <https://stackoverflow.com/questions/21364636/git-pull-rebase-preserve-merges>
#
# You should only rebase if you know (in a sort of general sense)
# what you are doing, and if you do know what you are doing, then you
# would probably prefer a merge-preserving rebase as a general rule.
#
# Although by the time you've decided that rebasing is a good idea,
# you will probably find that a history that has its own embedded
# branch-and-merge-points is not necessarily the correct "final
# rewritten history".
#
# That is, if it's appropriate to do a rebase at all, it's at least fairly
# likely that the history to be rebased is itself linear, so that the
# preserve-vs-flatten question is moot anyway.
#
# See <https://stackoverflow.com/questions/38269092/is-it-possible-to-put-preserve-merges-in-the-gitconfig>
#
# While preserving merges is probably generally superior, in at least a
# few ways, to discarding them when rebasing, the fact is that rebase
# cannot preserve them. The only thing it can do, once some commits
# have been copied to new commits, is re-perform them. This can have new
# and/or different merge conflicts, vs the last time the merge was done.
# You should also pay close attention to the restrictions on merge
# preservation in the git rebase documentation.
#
# Without getting into a lot of detail, it always seems to me that most
# commit graph subsets that "should be" rebased, rarely have any
# internal merges. If such a graph subset has a single final merge, you
# can simply strip away that merge (with git reset) before rebasing,
# and re-do that single merge manually at the end. (In fact, git rebase
# normally drops merge commits entirely, so you don't have to run the git
# reset itself in some cases. The one where you do have to run it is when
# the merge is into the branch onto which you intend to rebase. This is
# where git pull actually does the right thing when it uses
# `git rebase -p`, except that it fails to check for, and warn about,
# internal merges, which are sort of warning signs that rebasing might
# not be a good idea.
#
prp = pull --rebase=preserve
### rebase aliases ###
# rebase - forward-port local commits to the updated upstream head.
rb = rebase
# rebase abort - cancel the rebasing process
rba = rebase --abort
# rebase - continue the rebasing process after resolving a conflict manually and updating the index with the resolution.
rbc = rebase --continue
# rebase - restart the rebasing process by skipping the current patch.
rbs = rebase --skip
# rebase interactive - do the rebase with prompts.
rbi = rebase --interactive
# rbiu - rebase interactive on our unpushed commits.
#
# Before we push our local changes, we may want to do some cleanup,
# to improve our commit messages or squash related commits together.
#
# Let's say I've pushed two commits that are related to a new feature and
# I have another where I made a spelling mistake in the commit message.
#
# When I run "git rbiu" I get dropped into my editor with this:
#
# pick 7f06d36 foo
# pick ad544d0 goo
# pick de3083a hoo
#
# Let's say I want to squash the "foo" and "goo" commits together,
# and also change "hoo" to say "whatever". To do these, I change "pick"
# to say "s" for squash; this tells git to squash the two together;
# I also edit "hoo" to rename it to "whatever". I make the file look like:
#
# pick 7f06d36 foo
# s ad544d0 goo
# r de3083a whatever
#
# This gives me two new commit messages to edit, which I update.
# Now when I push the remote repo host receives two commits
#
# 3400455 - foo
# 5dae0a0 - whatever
#
rbiu = rebase --interactive @{upstream}
# See <https://blog.filippo.io/git-fixup-amending-an-older-commit/>
# This is a slightly modified version
fixup = "!f() { TARGET=\"$(git rev-parse \"$1\")\"; git commit --fixup=\"$TARGET\" && GIT_EDITOR=true git rebase --interactive --autosquash \"$TARGET\"~; }; f"
### reflog aliases ###
# reflog - reference log that manages when tips of branches are updated.
rl = reflog
### remote aliases ###
# remote - manage set of tracked repositories [same as "r"].
rr = remote
# remote show - gives some information about the remote <name>.
rrs = remote show
# remote update - fetch updates for a named set of remotes in the repository as defined by remotes.
rru = remote update
# remote prune - deletes all stale remote-tracking branches under <name>.
rrp = remote prune
### revert aliases ###
# revert - undo the changes from some existing commits
rv = revert
# revert without autocommit; useful when you're reverting more than one commits' effect to your index in a row.
rvnc = revert --no-commit
### show-branch aliases ###
# show-branch - print a list of branches and their commits.
sb = show-branch
### submodule aliases ###
# submodule - enables foreign repositories to be embedded within a dedicated subdirectory of the source tree.
sm = submodule
# submodule init
smi = submodule init
# submodule add
sma = submodule add
# submodule sync
sms = submodule sync
# submodule update
smu = submodule update
# submodule update with initialize
smui = submodule update --init
# submodule update with initialize and recursive; this is useful to bring a submodule fully up to date.
smuir = submodule update --init --recursive
### status aliases ###
# status with short format instead of full details
ss = status --short
# status with short format and showing branch and tracking info.
ssb = status --short --branch
### alias management aliases ###
# git alias: show help for git alias commands.
alias = "!f(){ \
echo \"Git Alias is project that has a collection of git alias commands.\"; \
echo \"The purpose is to help make git easier, faster, and more capable.\"; \
echo \"Free open source repository <https://github.com/gitalias/gitalias>.\"; \
echo \"\"; \
echo \"To see your existing git aliases:\"; \
echo \" git aliases\"; \
echo \"\"; \
echo \"To see your existing git aliases by using git directly:\"; \
echo \" git config --get-regexp ^alias\\.\"; \
};f"
# git add-alias: create a new git alias.
add-alias = "!f() { \
if [ $# != 3 ]; then \
echo \"Usage: git add-alias ( --local | --global ) <alias> <command>\"; \
echo \"Error: this command needs 3 arguments.\"; \
return 2; \
fi; \
if [ -n \"$(git config \"$1\" --get alias.\"$2\")\" ]; then \
echo \"Alias '$2' already exists, thus no change happened.\"; \
return 3; \
fi; \
git config \"$1\" alias.\"$2\" \"$3\" && \
return 0; \
echo \"Usage: git add-alias ( --local | --global ) <alias> <command>\"; \
echo \"Error: unknown failure.\"; \
return 1; \
}; f"
# git move-alias: rename an existing git alias.
move-alias = "!f() { \
if [ $# != 3 ]; then \
echo \"Usage: git move-alias ( --local | --global ) <alias existing name> <new alias name>\"; \
echo \"Error: this command needs 3 arguments.\"; \
return 2; \
fi; \
if [ \"$2\" = \"$3\" ]; then \
echo \"The alias names are identical, thus no change happened.\"; \
return 3; \
fi; \
if [ -z \"$(git config \"$1\" --get alias.\"$2\")\" ]; then \
echo \"Alias '$2' does not exist, thus no change happened.\"; \
return 4; \
fi; \
if [ -n \"$(git config \"$1\" --get alias.\"$3\")\" ]; then \
echo \"Alias '$3' already exists, thus no change happened.\"; \
return 5; \
fi; \
git config \"$1\" alias.\"$3\" \"$(git config \"$1\" --get alias.\"$2\")\" && \
git config \"$1\" --unset alias.\"$2\" && \
return 0; \
echo \"Usage: git move-alias ( --local | --global ) <alias existing name> <alias new name>\"; \
echo \"Error: unknown failure.\"; \
return 1; \
};f"
# Last tag in the current branch
last-tag = describe --tags --abbrev=0
# Last annotated tag in all branches
last-tagged = "!git describe --tags \"$(git rev-list --tags --max-count=1)\""
# From <https://gist.github.com/492227>
heads = "!git log origin/main.. --format='%Cred%h%Creset;%C(yellow)%an%Creset;%H;%Cblue%f%Creset' | git name-rev --stdin --always --name-only | column -t -s';'"
### diff-* aliases ###
diff-all = "!for name in $(git diff --name-only \"$1\"); do git difftool \"$1\" \"$name\" & done"
diff-changes = diff --name-status -r
diff-stat = diff --stat --ignore-space-change -r
diff-staged = diff --cached
# Diff using our preferred options. A.k.a. `dd`.
diff-deep = diff --check --dirstat --find-copies --find-renames --histogram --color
### grep-* aliases ###
# Find text in any commit ever.
grep-all = "!f() { git rev-list --all | xargs git grep \"$@\"; }; f"
# Find text and group the output lines. A.k.a. `gg`.
grep-group = grep --break --heading --line-number --color
# Find text with ack-like formatting.
grep-ack = "\
-c color.grep.linenumber=\"bold yellow\" \
-c color.grep.filename=\"bold green\" \
-c color.grep.match=\"reverse yellow\" \
grep --break --heading --line-number"
### init-* aliases ###
# Initalize a repo and immediately add an empty rebaseable commit.
# This initialization makes it easier to do later git rebase commands,
# because it enables a rebase to go all the way back to the first commit.
init-empty = "!f() { git init && git commit --allow-empty --allow-empty-message --message ''; }; f"
### merge-span-* aliases ###
# Given a merge commit, find the span of commits that exist(ed).
# Not so useful in itself, but used by other aliases.
# Thanks to Rob Miller for the merge-span-* aliases.
merge-span = "!f() { echo \"$(git log -1 \"$2\" --merges --pretty=format:%P | cut -d' ' -f1)$1$(git log -1 \"$2\" --merges --pretty=format:%P | cut -d' ' -f2)\"; }; f"
# Find the commits that were introduced by a merge
merge-span-log = "!git log \"$(git merge-span .. \"$1\")\""
# Show the changes that were introduced by a merge
merge-span-diff = "!git diff \"$(git merge-span ... \"$1\")\""
# Show the changes that were introduced by a merge, in your difftool
merge-span-difftool = "!git difftool \"$(git merge-span ... \"$1\")\""
# Interactively rebase all the commits on the current branch
rebase-branch = "!f() { git rebase --interactive \"$(git merge-base \"$(git default-branch)\") HEAD)\"; }; f"
# Find all objects that aren't referenced by any other object (orphans).
# To help an orphan, we create a new branch with the orphan's commit hash,
# then merge it into our current branch:
#
# git branch foo <commit>
# git merge foo
#
orphans = fsck --full
# List all blobs by size in bytes.
# By [CodeGnome](http://www.codegnome.com/)
rev-list-all-objects-by-size = "!git rev-list --all --objects | awk '{print $1}'| git cat-file --batch-check | grep -F blob | sort -k3nr"
# List all objects by size in bytes and file name.
# By [raphinesse](https://stackoverflow.com/users/380229/raphinesse)
rev-list-all-objects-by-size-and-name = "!git rev-list --all --objects | git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | awk '/^blob/ {print substr($0,6)}' | sort --numeric-sort --key=2"
### log-* aliases ###
# Show log of new commits after you fetched, with stats, excluding merges
log-fresh = log ORIG_HEAD.. --stat --no-merges
# Show log list with our preferred information, a.k.a. `ll`
#
# * Short date format using YYYY-MM-DD (no time, no zone)
# * Short hash commit format using abbreviated hexadecimal (not full hexadecimal)
# * Short author field using name (no email address) and signature mark
# * Short layout without columns
#
log-list = log --graph --topo-order --date=short --abbrev-commit --decorate --all --boundary --pretty=format:'%Cblue%ad %C(auto)%h%Creset -%C(auto)%d%Creset %s %Cblue[%aN]%Creset %Cblue%G?%Creset'
# Show log list with our preferred information with long formats, a.k.a. `lll`
#
# * Long date format using iso8601 strict YYYY-MM-DDTHH:MM:SS+HH:MM
# * Long hash commit format using full hexadecimal displayed as name-rev
# * Long author field using name and email address and signature mark
# * Long layout with columns
#
log-list-long = log --graph --topo-order --date=iso8601-strict --no-abbrev-commit --decorate --all --boundary --pretty=format:'%Cblue%ad %C(auto)%h%Creset -%C(auto)%d%Creset %s %Cblue[%aN <%aE>]%Creset %Cblue%G?%Creset'
# Show log for my own commits by my own user email
log-my = "!git log --author \"$(git config user.email)\""
# Show log as a graph
log-graph = log --graph --all --oneline --decorate
# Show the date of the first (a.k.a. earliest) commit, in strict ISO 8601 format
log-date-first = "!git log --date-order --format=%cI | tail -1"
# Show the date of the last (a.k.a. latest) commit, in strict ISO 8601 format
log-date-last = log -1 --date-order --format=%cI
# Show log with the recent hour, day, week, month, year
log-1-hour = log --since=1-hour-ago
log-1-day = log --since=1-day-ago
log-1-week = log --since=1-week-ago
log-1-month = log --since=1-month-ago
log-1-year = log --since=1-year-ago
# Show log with my own recent hour, day, week, month, year
log-my-hour = "!git log --author \"$(git config user.email)\" --since=1-hour-ago"
log-my-day = "!git log --author \"$(git config user.email)\" --since=1-day-ago"
log-my-week = "!git log --author \"$(git config user.email)\" --since=1-week-ago"
log-my-month = "!git log --author \"$(git config user.email)\" --since=1-month-ago"
log-my-year = "!git log --author \"$(git config user.email)\" --since=1-year-ago"
# Show a specific format string and its number of log entries
log-of-format-and-count = "!f() { format=\"$1\"; shift; git log \"$@\" --format=oneline --format=\"$format\" | awk '{a[$0]++}END{for(i in a){print i, a[i], int((a[i]/NR)*100) \"%\"}}' | sort; }; f"
log-of-count-and-format = "!f() { format=\"$1\"; shift; git log \"$@\" --format=oneline --format=\"$format\" | awk '{a[$0]++}END{for(i in a){print a[i], int((a[i]/NR)*100) \"%\", i}}' | sort -nr; }; f"
# Show the number of log entries by a specific format string and date format string
log-of-format-and-count-with-date = "!f() { format=\"$1\"; shift; date_format=\"$1\"; shift; git log \"$@\" --format=oneline --format=\"$format\" --date=format:\"$date_format\" | awk '{a[$0]++}END{for(i in a){print i, a[i], int((a[i]/NR)*100) \"%\"}}' | sort -r; }; f"
log-of-count-and-format-with-date = "!f() { format=\"$1\"; shift; date_format=\"$1\"; shift; git log \"$@\" --format=oneline --format=\"$format\" --date=format:\"$date_format\" | awk '{a[$0]++}END{for(i in a){print a[i], int((a[i]/NR)*100) \"%\", i}}' | sort -nr; }; f"
# Show the number of log items by email
log-of-email-and-count = "!f() { git log-of-format-and-count \"%aE\" \"$@\"; }; f"
log-of-count-and-email = "!f() { git log-of-count-and-format \"%aE\" \"$@\"; }; f"
# Show the number of log items by hour
log-of-hour-and-count = "!f() { git log-of-format-and-count-with-date \"%ad\" \"%Y-%m-%dT%H\" \"$@\" ; }; f"
log-of-count-and-hour = "!f() { git log-of-count-and-format-with-date \"%ad\" \"%Y-%m-%dT%H\" \"$@\" ; }; f"
# Show the number of log items by day
log-of-day-and-count = "!f() { git log-of-format-and-count-with-date \"%ad\" \"%Y-%m-%d\" \"$@\" ; }; f"
log-of-count-and-day = "!f() { git log-of-count-and-format-with-date \"%ad\" \"%Y-%m-%d\" \"$@\" ; }; f"
# Show the number of log items by week
log-of-week-and-count = "!f() { git log-of-format-and-count-with-date \"%ad\" \"%Y#%V\" \"$@\"; }; f"
log-of-count-and-week = "!f() { git log-of-count-and-format-with-date \"%ad\" \"%Y#%V\" \"$@\"; }; f"
# Show the number of log items by month
log-of-month-and-count = "!f() { git log-of-format-and-count-with-date \"%ad\" \"%Y-%m\" \"$@\" ; }; f"
log-of-count-and-month = "!f() { git log-of-count-and-format-with-date \"%ad\" \"%Y-%m\" \"$@\" ; }; f"
# Show the number of log items by year
log-of-year-and-count = "!f() { git log-of-format-and-count-with-date \"%ad\" \"%Y\" \"$@\" ; }; f"
log-of-count-and-year = "!f() { git log-of-count-and-format-with-date \"%ad\" \"%Y\" \"$@\" ; }; f"
# Show the number of log items by hour of day
log-of-hour-of-day-and-count = "!f() { git log-of-format-and-count-with-date \"%ad\" \"%H\" \"$@\"; }; f"
log-of-count-and-hour-of-day = "!f() { git log-of-count-and-format-with-date \"%ad\" \"%H\" \"$@\"; }; f"
# Show the number of log items by day of week
log-of-day-of-week-and-count = "!f() { git log-of-format-and-count-with-date \"%ad\" \"%u\" \"$@\"; }; f"
log-of-count-and-day-of-week = "!f() { git log-of-count-and-format-with-date \"%ad\" \"%u\" \"$@\"; }; f"
# Show the number of log items by week of year
log-of-week-of-year-and-count = "!f() { git log-of-format-and-count-with-date \"%ad\" \"%V\" \"$@\"; }; f"
log-of-count-and-week-of-year = "!f() { git log-of-count-and-format-with-date \"%ad\" \"%V\" \"$@\"; }; f"
# TODO
log-refs = log --all --graph --decorate --oneline --simplify-by-decoration --no-merges
log-timeline = log --format='%h %an %ar - %s'
log-local = log --oneline origin..HEAD
log-fetched = log --oneline HEAD..origin/main
# chart: show a summary chart of activity per author.
#
# Example:
#
# $ git chart
# ..X..........X...2..12 alice@example.com
# ....2..2..13.......... bob@example.com
# 2.....1....11......... carol@example.com
# ..1............1..1... david@example.com
# ....1.......1.3.3.22.2 eve@example.com
#
# The chart rows are the authors.
# TODO: sort the rows meaningfully,
# such as alphabetically, or by count.
#
# The chart columns are the days.
# The chart column prints one character per day.
#
# * For 1-9 commits, show the number.
# * For 10 or more commits, show "X" as a visual indicator.
# * For no commits, show "." as a visual placeholder.
#
# The chart timeline adjusts the date range automatically:
#
# * The timeline starts with the date of the earliest commit.
# * The timeline stops with the date of the latest commit.
# * The intent is to show the most relevant information.
#
# The chart default is to look at the past 6 weeks;
# this gives a good balance of recency and speed
# for a team that's currently working on a repo,
# and also gives a good balance of fitting within
# one terminal window 80 character width.
#
# You can adjust how far back the chart looks,
# by providing your own `--since` parameter.
# For example if you want to chart an older repo,
# that does not have any recent commits, then you
# you must provide a longer `--since` parameter.
#
chart = "!f() { \
git log \
--format=oneline \
--format=\"%aE %at\" \
--since=6-weeks-ago \
\"$*\" | \
awk ' \
function time_to_slot(t) { return strftime(\"%Y-%m-%d\", t, true) } \
function count_to_char(i) { return (i > 0) ? ((i < 10) ? i : \"X\") : \".\" } \
BEGIN { \
time_min = systime(); time_max = 0; \
SECONDS_PER_DAY=86400; \
} \
{ \
item = $1; \
time = 0 + $2; \
if (time > time_max){ time_max = time } else if (time < time_min){ time_min = time }; \
slot = time_to_slot(time); \
items[item]++; \
slots[slot]++; \
views[item, slot]++; \
} \
END{ \
printf(\"Chart time range %s to %s.\\n\", time_to_slot(time_min), time_to_slot(time_max)); \
time_max_add = time_max += SECONDS_PER_DAY; \
for(item in items){ \
row = \"\"; \
for(time = time_min; time < time_max_add; time += SECONDS_PER_DAY) { \
slot = time_to_slot(time); \
count = views[item, slot]; \
row = row count_to_char(count); \
} \
print row, item; \
} \
}'; \
}; f"
# churn: show log of files that have many changes
#
# * Written by [Corey Haines](http://coreyhaines.com/)
# * Scriptified by Gary Bernhardt
# * Obtained from <https://github.com/garybernhardt/dotfiles/blob/main/bin/git-churn>
# * Edited for GitAlias.com repo by Joel Parker Henderson
# * Comments by Mislav <http://mislav.uniqpath.com/2014/02/hidden-documentation/>
#
# Show churn for whole repo:
#
# $ git churn
#
# Show churn for specific directories:
#
# $ git churn app lib
#
# Show churn for a time range:
#
# $ git churn --since=1-month-ago
#
# These are all standard arguments to `git log`.
#
# It's possible to get valuable insight from history of a project not only
# by viewing individual commits, but by analyzing sets of changes as a whole.
# For instance, `git churn` compiles stats about which files change the most.
#
# For example, to see where work on an app was focused on in the past month:
#
# $ git churn --since=1-month-ago app/ | tail
#
# This can also highlight potential problems with technical debt in a project.
# A specific file changing too often is generally a red flag, since it probably
# means the file either needed to be frequently fixed for bugs, or the file
# holds too much responsibility and should be split into smaller units.
#
# Similar methods of history analysis can be employed to see which people were
# responsible recently for development of a certain part of the codebase.
#
# For instance, to see who contributed most to the API part of an application:
#
# $ git log --format='%an' --since=1-month-ago app/controllers/api/ | \
# sort | uniq -c | sort -rn | head
#
# 109 Alice Anderson
# 13 Bob Brown
# 7 Carol Clark
#
churn = "!f() { git log --all --find-copies --find-renames --name-only --format='format:' \"$@\" | awk 'NF{a[$0]++}END{for(i in a){print a[i], i}}' | sort -rn;};f"
# summary: print a helpful summary of some typical metrics
summary = "!f() { \
printf \"Summary of this branch...\n\"; \
printf \"%s\n\" \"$(git current-branch)\"; \
printf \"%s first commit timestamp\n\" \"$(git log --date-order --format=%cI | tail -1)\"; \
printf \"%s last commit timestamp\n\" \"$(git log -1 --date-order --format=%cI)\"; \
printf \"\nSummary of counts...\n\"; \
printf \"%d commit count\n\" \"$(git rev-list --count HEAD)\"; \
printf \"%d date count\n\" \"$(git log --format=oneline --format=\"%ad\" --date=format:\"%Y-%m-%d\" | awk '{a[$0]=1}END{for(i in a){n++;} print n}')\"; \
printf \"%d tag count\n\" \"$(git tag | wc -l)\"; \
printf \"%d author count\n\" \"$(git log --format=oneline --format=\"%aE\" | awk '{a[$0]=1}END{for(i in a){n++;} print n}')\"; \
printf \"%d committer count\n\" \"$(git log --format=oneline --format=\"%cE\" | awk '{a[$0]=1}END{for(i in a){n++;} print n}')\"; \
printf \"%d local branch count\n\" \"$(git branch | grep -vc \" -> \")\"; \
printf \"%d remote branch count\n\" \"$(git branch --remotes | grep -vc \" -> \")\"; \
printf \"\nSummary of this directory...\n\"; \
printf \"%s\n\" \"$(pwd)\"; \
printf \"%d file count via git ls-files\n\" \"$(git ls-files | wc -l)\"; \
printf \"%d file count via find command\n\" \"$(find . | wc -l)\"; \
printf \"%d disk usage\n\" \"$(du -s | awk '{print $1}')\"; \
printf \"\nMost-active authors, with commit count and %%...\n\"; git log-of-count-and-email | head -7; \
printf \"\nMost-active dates, with commit count and %%...\n\"; git log-of-count-and-day | head -7; \
printf \"\nMost-active files, with churn count\n\"; git churn | head -7; \
}; f"
### branch-commit-* aliases to show hashes via sort order ###
# Show a branch's commit hash (or multiple hashes)
# by using ordering keywords ("first" or "last"):
#
# * `branch-commit-first`: show a branch's first commit hash (or hashes)
#
# * `branch-commit-last`: show a branch's last commit hash (or hashes)
#
# * `branch-commit-prev`: show a branch's previous commit hash (or hashes)
#
# * `branch-commit-next`: show a branch's next commit hash (or hashes)
#
# Inspirations:
#
# * Email from Demian proposing these aliases
#
# * https://github.com/hutusi/git-paging
#
# branch-commit-first
#
# Show a branch's first commit hash (or hashes).
#
# Syntax:
#
# git branch-commit-first [branch name [commit count]]
#
# Options:
#
# * branch name: default is the current branch name.
#
# * commit count: default is 1
#
# Example: show the current branch's first commit hash:
#
# git branch-commit-first
#
# Example: show the "foo" branch's first commit hash:
#
# git branch-commit-first foo
#
# Example: show the "foo" branch's first 3 commit hashes:
#
# git branch-commit-first foo 3
#
branch-commit-first = "!f() { \
branch=\"${1:-$(git current-branch)}\"; \
count=\"${2:-1}\"; \
git log --reverse --pretty=%H \"$branch\" | \
head -\"$count\"; \
}; f"
# branch-commit-last
#
# Show a branch's last commit hash (or hashes).
#
# Syntax:
#
# git branch-commit-last [branch name [commit count]]
#
# Options:
#
# * branch name: default is the current branch name.
#
# * commit count: default is 1
#
# Example: show the current branch's last commit hash:
#
# git branch-commit-last
#
# Example: show the "foo" branch's last commit hash:
#
# git branch-commit-last foo
#
# Example: show the "foo" branch's last 3 commit hashes:
#
# git branch-commit-last foo 3
#
branch-commit-last = "!f() { \
branch=\"${1:-$(git current-branch)}\"; \
count=\"${2:-1}\"; \
git log --pretty=%H \"$branch\" | \
head -\"$count\"; \
}; f"
# branch-commit-prev
#
# Show a branch's previous commit hash (or hashes).
#
# Syntax:
#
# git branch-commit-prev [branch name [commit count]]
#
# Options:
#
# * branch name: default is the current branch name.
#
# * commit count: default is 1
#
# Example: show the current branch's previous commit hash:
#
# git branch-commit-prev
#
# Example: show the "foo" branch's previous commit hash:
#
# git branch-commit-prev previous
#
# Example: show the "foo" branch's previous 3 commit hashes:
#
# git branch-commit-prev foo 3
#
branch-commit-prev = "!f() { \
branch=\"${1:-$(git current-branch)}\"; \
count=\"${2:-1}\"; \
git log --pretty=%H \"$branch\" | \
grep -A \"$count\" \"$(git rev-parse HEAD)\" | \
tail +2; \
}; f"
# branch-commit-next
#
# Show a branch's next commit hash (or hashes).
#
# Syntax:
#
# git branch-commit-next [branch name [commit count]]
#
# Options:
#
# * branch name: default is the current branch name.
#
# * commit count: default is 1
#
# Example: show the current branch's next commit hash:
#
# git branch-commit-next
#
# Example: show the "foo" branch's next commit hash:
#
# git branch-commit-next next
#
# Example: show the "foo" branch's next 3 commit hashes:
#
# git branch-commit-next foo 3
#