-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
34 lines (34 loc) · 988 Bytes
/
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
[user]
name = Carl Wiedemann
# email = [email protected]
# signingkey = 3AA068723663D81E
[push]
default = current
autoSetupRemote = true
[pull]
default = current
rebase = true
[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
[core]
pager = delta
# excludesfile = /Users/carl.wiedemann/.gitignore
[interactive]
diffFilter = delta --color-only
[add.interactive]
useBuiltin = false # required for git 2.37.0
[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)
side-by-side = true
[merge]
conflictstyle = diff3
[diff]
colorMoved = default
[commit]
gpgsign = true
[gpg "x509"]
program = gpg