-
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdot_gitconfig.tmpl
116 lines (115 loc) · 3.31 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
# SPDX-FileCopyrightText: Chris Wilson <[email protected]>
#
# SPDX-License-Identifier: MIT
[user]
name = Chris Wilson
email = {{ .email }}
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMmOdgdN3KlDNWhR7qRVqmJnBPPwMLdV+J6IMlKN3MPd
[gpg]
format = ssh
[gpg "ssh"]
{{- if eq .chezmoi.os "darwin" }}
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
{{- else if eq .chezmoi.os "linux" }}
program = "/opt/1Password/op-ssh-sign"
{{- end }}
allowedSignersFile = "~/.ssh/allowed_signers"
[commit]
gpgsign = true
[core]
editor = code --wait
excludesfile = ~/.gitignore
quotepath = false
[color]
diff = auto
status = auto
branch = auto
interactive = auto
[alias]
st = status
ci = commit
co = checkout
br = branch
ecm = commit --allow-empty-message --no-edit
unstage = reset HEAD --
last = log -1 HEAD
stash-unapply = !git stash show -p | git apply -R
amend = commit --amend --no-edit
gerrit = push origin HEAD:refs/for/master
prepush = log --graph --stat origin/master..
sdiff = !git diff && git submodule foreach 'git diff'
spush = push --recurse-submodules=on-demand
supdate = submodule update --remote --merge
[color "diff"]
whitespace = red reverse
[instaweb]
local = true
httpd = webrick
[push]
default = simple
recurseSubmodules = check
[status]
submodulesummary = 1
[pull]
rebase = false
[init]
defaultBranch = main
templateDir = ~/.git-template
[fetch]
prune = true
[diff]
{{- if eq .chezmoi.os "darwin" }}
tool = Kaleidoscope
{{- else if eq .chezmoi.os "linux" }}
tool = meld
{{- end }}
submodule = log
[difftool]
prompt = false
trustExitCode = true
[merge]
{{- if eq .chezmoi.os "darwin" }}
tool = Kaleidoscope
{{- else if eq .chezmoi.os "linux" }}
tool = meld
{{- end }}
summary = true
[mergetool]
prompt = false
[difftool "code"]
cmd = code --wait --diff \"$LOCAL\" \"$REMOTE\"
[mergetool "code"]
cmd = code --wait --merge \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
{{- if eq .chezmoi.os "darwin" }}
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[difftool "sourcetree"]
cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
{{- else if eq .chezmoi.os "linux" }}
[difftool "meld"]
cmd = meld \"$LOCAL\" \"$REMOTE\"
[mergetool "meld"]
cmd = meld \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\"
{{- end }}
{{- if eq .email "[email protected]" }}
[includeIf "gitdir:~/workspace/flyingcampdesign/"]
path = ~/.gitconfigs/flyingcampdesign.gitconfig
[includeIf "gitdir:~/workspace/cgnd/"]
path = ~/.gitconfigs/cgnd.gitconfig
{{- end }}
{{- if eq .chezmoi.os "darwin" }}
[difftool "kicad-ksdiff"]
cmd = kicad-ksdiff \"$LOCAL\" \"$REMOTE\"
{{- end }}
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true