/
.gitconfig
119 lines (94 loc) · 2.5 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
[user]
name = Douglas Anderson
email = hockeybuggy@gmail.com
signingkey = 9892CB4012843ABE
[color]
branch = auto
diff = auto
status = auto
ui = true
[init]
defaultBranch = main
[alias]
# Commit aliases
co = commit -v
com = commit -m
ca = commit -av
caa = commit -av --amend
cam = commit -am
cane = commit -a --amend --no-edit
# Local status aliases
sta = status -s
diff = diff --color-moved
# Logging aliases
sl = log --oneline --decorate -20
slp = log --oneline --decorate
sla = log --oneline --decorate --graph --all -20
slap = log --oneline --decorate --graph --all
lgbr = log main..
# Branching aliases
bra = branch
sw = switch
# Rebase aliases
rb = rebase
rbi = rebase --interactive
rbc = rebase --continue
rbm = rebase main
rbim = rebase --interactive main
# Push-Pull aliases
po = push origin
pl = pull
plo = pull origin
plom = pull origin main
plu = pull upstream
pof = push origin --force
# Cloneing aliases
cl = clone
clo = clone
# Other aliases
pick = cherry-pick
who = blame
edit-conflicts = !"editconflicts() { $EDITOR $(git diff --name-only --diff-filter=U); }; editconflicts"
merge-pr = !"mergepr() { git checkout main && git pull && git checkout $1 && git rebase main && git checkout main && git merge $1 && git push --no-verify && git branch --delete $1 && git push --no-verify --delete origin $1 && git pull; }; mergepr"
tag-release = !"tagrelease() { git fetch && git checkout main && git tag --sign --message \"Version $1\" v$1 && git push --tags; }; tagrelease"
rebase-to-main = !"rebasetomain() { git checkout main && git pull origin main && git checkout - && git rebase main; }; rebasetomain"
modernize-branch-names = !"modernizebranchnames() { git branch -m master main && git push -u origin main; }; modernizebranchnames"
[gpg]
program = gpg
[protocol]
version = 2
[push]
default = current
[pull]
ff = only
[commit]
template = ~/.gitmessage
gpgsign = true
[rebase]
autosquash = true
[log]
date = human
[core]
pager = diff-so-fancy | less --tabs=4 -RFX
[color "diff"]
meta = yellow
frag = magenta bold
commit = yellow
old = red
new = green
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red
oldHighlight = red 52
newNormal = green
newHighlight = green 22
[protocol "http"]
allow = never
[protocol "git"]
allow = never
[fetch]
fsckObjects = true
[transfer]
fsckObjects = true
[receive]
fsckObjects = true