-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
53 lines (53 loc) · 1.21 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
[user]
name = James Rampton
email = [email protected]
[branch]
sort = -committerdate
[commit]
gpgsign = true
verbose = true
[core]
editor = hx
pager = delta
[delta]
navigate = true # use n and N to move between diff sections
light = false
side-by-side = true
line-numbers = true
syntax-theme = none
true-color = always
plus-style = reverse green
plus-emph-style = reverse blue
minus-style = reverse red
minus-emph-style = reverse blue
line-numbers-plus-style = green
line-numbers-minus-style = red
line-numbers-zero-style = gray
[diff]
colorMoved = default
tool = Kaleidoscope
algorithm = histogram
context = 10
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
prompt = false
[gpg]
format = ssh
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
[init]
defaultBranch = main
[interactive]
diffFilter = delta --color-only --features=interactive
[merge]
conflictstyle = zdiff3
tool = Kaleidoscope
keepbackup = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool]
prompt = false
[pull]
rebase = false
[push]
autoSetupRemote = true