33 lines
737 B
INI
33 lines
737 B
INI
[user]
|
|
email = lennart.alff@gmail.com
|
|
name = Thies Lennart Alff
|
|
[merge]
|
|
tool = "nvim"
|
|
[mergetool]
|
|
keepBackup = false
|
|
prompt = false
|
|
[mergetool "nvim"]
|
|
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
|
|
[mergetool "vscode"]
|
|
cmd = code --wait $MERGED
|
|
[diff]
|
|
guitool = vscode
|
|
tool = nvimdiff
|
|
prompt = true
|
|
[difftool "nvimdiff"]
|
|
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
|
|
layout = LOCAL,MERGED,REMOTE
|
|
[difftool "vscode"]
|
|
cmd = code --wait --diff $LOCAL $REMOTE
|
|
[init]
|
|
defaultBranch = main
|
|
[core]
|
|
editor = nvim
|
|
autocrlf = input
|
|
[pull]
|
|
ff = only
|
|
[filter "lfs"]
|
|
required = true
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|
|
process = git-lfs filter-process
|