[git] Re-indent gitconfig and use zdiff3 conflictstyle

^hat @moonglum
This commit is contained in:
Sebastian Schulze 2024-12-14 23:49:43 +01:00
parent f874484f36
commit 2bbb04884d
Signed by: bascht
GPG key ID: 5BCB1D3B4D38A35A

View file

@ -1,22 +1,22 @@
[user]
name = Sebastian Schulze
email = {{ .git.email }}
signingkey = {{ .git.signingkey }}
name = Sebastian Schulze
email = {{ .git.email }}
signingkey = {{ .git.signingkey }}
[core]
excludesfile = ~/.gitignore
editor = em -nw
hooksPath = ~/.config/git/hooks
pager = delta
excludesfile = ~/.gitignore
editor = em -nw
hooksPath = ~/.config/git/hooks
pager = delta
[commit]
gpgsign = true
gpgsign = true
[interactive]
diffFilter = delta --color-only
diffFilter = delta --color-only
[delta]
navigate = true
navigate = true
light = true
side-by-side = true
features = unobtrusive-line-numbers decorations
@ -30,7 +30,7 @@
hunk-header-decoration-style = yellow box
[merge]
conflictstyle = diff3
conflictstyle = zdiff3
[diff]
colorMoved = default