/
.gitconfig
137 lines (116 loc) · 3.54 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
[branch]
autosetupmerge = always # setup branch tracking
autosetuprebase = always # default to rebasing rather than merge
[color]
# turn on coloring in terminals
ui = auto
[column]
# format lists, e.g. from git-branch, wide like `ls`'s output
ui = auto
[diff]
renames = copies # more aggresisve rename detection
[core]
# Use less as our pager, turn off the -c option if it was specified in $LESS,
# also don't use -S as per git default
pager = "less -+c -FRX"
[grep]
patternType = extended # use modern regexp dialect by default
[log]
# change default passed to git-log, so that we now get by default:
# git log --abbrev-commit --date=relative --decorate ...
abbrevCommit = true
date = relative
decorate = true
[merge]
stat = false # no summary diff stats
[rebase]
stat = false # no summary diff stats
autosquash = true # honor commit markers like `fixup!`
# instructionFormat = %s %d # subject with decoration
updateRefs = true
[rerere]
# remember and re-use merge conflict resolutions
autoupdate = true
enabled = true
[format]
pretty = authorbody
# log formats
[pretty]
brief = %C(red)%h %C(green)%cd %Creset%s%C(yellow)%d%Creset
briefbody = %C(red)%h %C(green)%cd %Creset%s%C(yellow)%d%Creset%n%n%-b
author = %C(red)%h %C(green)%cd %Creset%<(60,trunc)%s%C(yellow)%>>|(90)%d %C(bold blue)- %an <%ae> %ad%Creset
authorbody = %C(red)%h %C(green)%cd %Creset%<(60,trunc)%s%C(yellow)%>>|(90)%d %C(bold blue)- %an <%ae> %ad%Creset%n%n%-b
briefreflog = %C(green)%gd %C(red)%h%Creset %C(bold blue)<%gn>%Creset %gs
# Command aliases
[alias]
ap = add -p
au = add --update
br = branch
brav = branch -av
brv = branch -v
cf = clean -f
ch = cherry -v
ci = commit
cia = commit -a
ciam = commit -a -m
cic = commit -c
cim = commit -m
cix = commit --allow-empty -m 'Ex Nihilo'
cn = clean -n
co = checkout
cp = cherry-pick
dc = diff --cached
doh = commit --amend --no-edit
dohe = commit --amend --edit
lg = log --pretty=author
lob = log --pretty=briefbody
lb = log --pretty=brief
logg = log --graph
lgg = log --graph --pretty=author
lobg = log --graph --pretty=briefbody
lbg = log --graph --pretty=brief
logf = log --graph --first-parent
lgf = log --graph --first-parent --pretty=author
lobf = log --graph --first-parent --pretty=briefbody
lbf = log --graph --first-parent --pretty=brief
pub = !git push -u origin $(git symbolic-ref HEAD | sed -e 's~^refs/heads/~~')
rb = rebase
ra = rebase --abort
rc = rebase --continue
re = rebase --edit-todo
redo = reset HEAD^ --mixed
rem = remote
remv = remote -v
rs = rebase --skip
rst = reset --hard
st = status --short --branch
suri = submodule update --recursive --init
uewu = config user.email jcorbin@wunjo.org
mrg = merge --no-edit --no-ff
mark = commit -m mark --allow-empty
fp = merge-base --fork-point
[commit]
verbose = true
# Commiter identity
[user]
email = jcorbin@wunjo.org
name = Joshua T Corbin
[init]
defaultBranch = main
[advice]
detachedHead = false
pushNonFastForward = false
statusHints = false
[apply]
# Fix all whitespace sins when applying patches
whitespace = fix
[pack]
# Use one thread per processor core for pac king
threads = 0
[push]
default = simple
[http]
followRedirects = true
[url "ssh://git@github.com/"]
insteadOf = https://github.com/
pushInsteadOf = https://github.com/