-
Notifications
You must be signed in to change notification settings - Fork 2
/
dot_gitconfig.tmpl
173 lines (149 loc) · 4.77 KB
/
dot_gitconfig.tmpl
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
[user]
{{- if .name }}
name = {{ .name | quote }}
{{- end }}
{{- if .email }}
email = {{ .email | quote }}
{{- end }}
{{- if .enable.onepassword }}
{{- if .ssh_key }}
signingkey = {{ (onepasswordDetailsFields "id_rsa_default").public_key.value }}
{{- end }}
{{- end }}
[alias]
exec = ! "exec"
st = status -sb
br = branch -vv
bra = branch -vv --all
bed = branch --edit-description
aa = add --all :/
ci = commit -v
ca = commit --amend -v
save = commit -a -m "Save"
co = checkout
di = diff
dis = diff --stat
diw = diff --color-words
dc = diff --cached
dcs = diff --cached --stat
dcw = diff --cached --color-words
dh = diff HEAD~
dhs = diff HEAD~ --stat
dhw = diff HEAD~ --color-words
du = diff @{u}...
dus = diff @{u}... --stat
duw = diff @{u}... --color-words
grp = grep -C 1
ff = merge --ff-only
noff = merge --no-ff
f = fetch --tags --prune
fa = fetch --all --tags --prune
pullrb = pull --rebase
mirror-remote = ! "mr() { git push \"${2}\" \"refs/remotes/${1}/*:refs/heads/*\" && git remote set-head \"${2}\" -a; }; mr"
count = diff --stat "4b825dc642cb6eb9a060e54bf8d69288fbee4904" # hash of empty tree
credit = shortlog -sn
linecredit = ! "lc() { git ls-tree --name-only -z -r HEAD | xargs -0 -n1 git diff --no-index --numstat /dev/null 2>/dev/null | grep -v '^-' | cut -f 3- | cut -d ' ' -f 3- | xargs -n1 git blame --line-porcelain | grep '^author ' | cut -d ' ' -f 2- | sort | uniq -c | sort -nr; }; lc"
cc = rev-list HEAD --count
cca = rev-list --all --count
lg = log -p
gr = log --graph --format=compact # graph
grl = log --graph --format=line # graph line
grd = log --graph --format=detail # graph detail
gra = log --graph --format=compact --all # graph all
gral = log --graph --format=line --all # graph all line
grad = log --graph --format=detail --all # graph all in detail
cleanall = clean -fdx # this is dangerous, so it's intentionally long to type
ctags = ! "ctg() { trap \"rm -f .git/tags.$$\" EXIT; ctags --tag-relative -Rf.git/tags.$$ --exclude=.git; mv .git/tags.$$ .git/tags; }; ctg"
empty-tree-hash = hash-object -t tree /dev/null
info = ! "inf() { if git rev-parse ${1} >/dev/null 2>&1; then git cat-file -p $(git rev-parse ${1}); else echo Invalid object; fi }; inf"
root = rev-parse --show-toplevel
sf = show --format=fuller
sfs = show --format=fuller --stat
sfw = show --format=fuller --color-words
staash = stash --include-untracked
stsh = stash --keep-index
tar = ! "tar() { git archive --format tar --prefix=\"${PWD##*/}/\" HEAD -o ${1}; }; tar"
targz = ! "targz() { git archive --format tar.gz --prefix=\"${PWD##*/}/\" HEAD -o ${1}; }; targz"
unstage = reset HEAD --
update-submodules = submodule update --init --recursive
upgrade-submodules = submodule update --init --remote
zip = ! "zip() { git archive --format zip --prefix=\"${PWD##*/}/\" HEAD -o ${1}; }; zip"
[diff]
mnemonicPrefix = true
wordRegex = "[^[:space:]]|([[:alnum:]]|UTF_8_GUARD)+"
compactionHeuristic = true
colorMoved = default
tool = vscode
[merge]
tool = vscode
keepBackup = false;
conflictstyle = diff3
[mergetool "vscode"]
cmd = code-insiders -r --wait --merge $REMOTE $LOCAL $BASE $MERGED
[difftool "vscode"]
cmd = code-insiders -r --wait --diff $LOCAL $REMOTE
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[color]
ui = auto
[color "grep"]
match = cyan bold
selected = blue
context = normal
filename = magenta
linenumber = green
separator = yellow
function = blue
[pretty]
line = "%C(auto)%h%d %s %C(yellow)by %C(blue)%an %C(green)%ar"
compact = "%C(auto)%h %s %C(green)%ar%n %C(auto)%d%n"
detail = "%C(auto)%h %s%n %C(yellow)by %C(blue)%an %C(magenta)<%ae> [%G?] %C(green)%ar%n %C(auto)%d%n"
[pull]
default = current
rebase = true
[push]
default = current
[grep]
lineNumber = true
[core]
excludesfile = ~/.gitignore
pager = delta
editor = code-insiders -r --wait
ignorecase = false
[http]
sslVerify = true
[init]
templatedir = ~/.git-templates
[fetch]
prune = true
[difftool]
prompt = false
[mergetool]
prompt = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
{{- if .enable.onepassword }}
{{- if .ssh_key }}
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
{{- end }}
{{- end }}
[gpg]
format = ssh
[commit]
gpgsign = true
[format]
pretty = oneline
[log]
abbrevCommit = true
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)