-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
189 lines (166 loc) · 6.29 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
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
[alias]
ai = add --interactive
amend = !git commit --amend --no-edit --reset-author && echo && git --no-pager status
ap = add --patch
b = branch
ba = branch -avv
bm = branch --merged
bnm = branch --no-merged
ca = !git commit --amend --no-edit --reset-author && echo && git --no-pager status
ce = !git commit --amend --reset-author && echo && git --no-pager status
ci = commit
changed = diff --name-only
co = checkout
cob = checkout -b
cp = cherry-pick --ff
d = diff --find-copies
da = diff --find-copies --text
dac = diff --find-copies --text --cached
dacw = diff --find-copies --text --cached --ignore-all-space
dacww = diff --find-copies --text --cached --ignore-all-space --word-diff=color
dacwww = diff --find-copies --text --cached --ignore-all-space --word-diff=color --word-diff-regex=.
daw = diff --find-copies --text --ignore-all-space
daww = diff --find-copies --text --ignore-all-space --word-diff=color
dawww = diff --find-copies --text --ignore-all-space --word-diff=color --word-diff-regex=.
dc = diff --find-copies --cached
dcf = diff --find-copies --cached --stat
dcw = diff --find-copies --cached --ignore-all-space
dcww = diff --find-copies --cached --ignore-all-space --word-diff=color
dcwww = diff --find-copies --cached --ignore-all-space --word-diff=color --word-diff-regex=.
df = diff --find-copies --stat
dw = diff --find-copies --ignore-all-space
dww = diff --find-copies --ignore-all-space --word-diff=color
dwww = diff --find-copies --ignore-all-space --word-diff=color --word-diff-regex=.
f = fetch -v --prune
fe = fetch -v --prune
g = grep --untracked --break --heading --line-number
g3 = grep --untracked --break --heading --line-number -C3
g6 = grep --untracked --break --heading --line-number -C6
g9 = grep --untracked --break --heading --line-number -C9
ga3 = ga -C3
ga6 = ga -C6
ga9 = ga -C9
gi = grep --untracked --break --heading --line-number --ignore-case
gi3 = grep --untracked --break --heading --line-number --ignore-case -C3
gi6 = grep --untracked --break --heading --line-number --ignore-case -C6
gi9 = grep --untracked --break --heading --line-number --ignore-case -C9
gil = grep --untracked --break --heading --line-number --ignore-case --name-only
gl = grep --untracked --break --heading --line-number --name-only
ignored = ls-files --others -i --exclude-standard --directory
l = log --decorate --name-status
l1 = log --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%ci) %C(bold blue)<%an>%C(reset)'
lg = log --decorate --graph
lg1 = log --graph --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(green)(%ci) %C(bold blue)<%an>%C(reset)'
ll = log --decorate
lp = log --decorate -p
lpa = log --decorate -p -a
lpaw = log --decorate -p -a --ignore-all-space
lpf = log --decorate -p --follow
lpw = log --decorate -p --ignore-all-space
lpwa = log --decorate -p -a --ignore-all-space
m = merge
mt = mergetool
p = push
pl = pull
plr = pull --rebase
r = remote
ra = remote add
rb = rebase
rba = rebase --abort
rbc = rebase --continue
rbi = rebase --interactive
rbs = rebase --skip
rem = remote -v
remotes = remote -v
rl = reflog
rmc = rm --cached -r
root = rev-parse --show-toplevel
rv = revert
s = status
sa = all status --short
su = status --untracked-files
sub = submodule
sync = !git submodule sync --recursive && git submodule update --init --recursive
t = tag
todo = grep --untracked --line-number 'TODO\\|XXX\\|FIXME'
unshallow = fetch --unshallow
[color]
branch = auto
diff = auto
grep = auto
status = auto
[color "grep"]
# This doesn't work on Ubuntu 20.04
#match = brightred
[commit]
cleanup = scissors
verbose = 2
[core]
pager = delta-or-less
[delta]
features = decorations
navigate = true
[delta "decorations"]
file-decoration-style = brightwhite
file-style = brightwhite
grep-file-style = brightwhite
hunk-header-decoration-style = none
hunk-header-file-style = brightcyan
hunk-header-line-number-style = brightcyan
hunk-header-style = cyan
line-numbers = true
line-numbers-minus-style = red
line-numbers-plus-style = green
line-numbers-left-style = white
line-numbers-right-style = white
minus-non-emph-style = syntax 52
minus-emph-style = syntax 88
minus-empty-line-marker-style = syntax 52
minus-style = syntax 52
plus-non-emph-style = syntax 22
plus-emph-style = syntax 28
plus-empty-line-marker-style = syntax 22
plus-style = syntax 22
[diff]
colorMoved = default
[help]
autocorrect = prompt
[init]
defaultBranch = main
[merge]
conflictstyle = diff3
tool = vimdiff3
[mergetool]
keepBackup = false
[pack]
threads = 0
[pager]
grep = less # 1 Feb 2023: 'delta' can't handle this format - it replaces "-" with ":" in filenames
ls-files = true
status = true
tag = false
[pull]
rebase = false
[push]
default = upstream
followTags = true
[rerere]
enabled = true
[tag]
sort = version:refname
[url "[email protected]:"]
insteadOf = lp:
pushInsteadOf = https://git.launchpad.net/
[url "[email protected]:it/"]
insteadOf = it:
[url "[email protected]:"]
insteadOf = gh:
pushInsteadOf = https://github.com/
[url "[email protected]:"]
insteadOf = gl:
pushInsteadOf = https://gitlab.com/
[user]
email = [email protected]
name = Dave James Miller
[include]
path = .gitconfig_local