dotfiles/gitconfig at master · czocher/dotfiles · GitHub

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
[core]
editor = nvim
autocrlf = input
safecrlf = true

[user]
name = Paweł Jan Czochański
signingkey = ~/.ssh/id_ed25519_sk.pub
useConfigOnly = true

[gpg]
format = ssh

[commit]
gpgsign = true

[tag]
gpgsign = true
sort = version:refname

[push]
default = simple
gpgSign = if-asked
followTags = true
autoSetupRemote = true

[pull]
ff = only

[merge]
ff = only
conflictstyle = zdiff3
tool = meld

[mergetool]
keepBackup = false

[mergetool "meld"]
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"

[diff]
tool = meld
algorithm = histogram
colorMoved = zebra
colorMovedWS = allow-indentation-change

[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"

[fetch]
prune = true
writeCommitGraph = true

[transfer]
fsckObjects = true

[rerere]
enabled = true

[status]
showStash = true

[color]
ui = true