30 lines
860 B
Plaintext
30 lines
860 B
Plaintext
# Identity lives in hosts/<hostname>/git/config, pulled in by the include
|
|
# below. Three machines, three identities — one of which was signing personal
|
|
# commits as a previous employer until the 2026-09 refit.
|
|
[include]
|
|
path = ~/.config/git/identity
|
|
|
|
[init]
|
|
defaultBranch = main
|
|
[pull]
|
|
rebase = false
|
|
[core]
|
|
pager = delta
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
[delta]
|
|
navigate = true # n/N jump between files
|
|
line-numbers = true
|
|
syntax-theme = ansi # use the terminal palette
|
|
[merge]
|
|
conflictStyle = zdiff3
|
|
# Structural diffs via difftastic, on demand; delta stays the default pager.
|
|
[alias]
|
|
dft = -c diff.external=difft diff
|
|
dlog = -c diff.external=difft log -p --ext-diff
|
|
[filter "lfs"]
|
|
required = true
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|
|
process = git-lfs filter-process
|