mirror of
https://github.com/Stunkymonkey/dotfiles.git
synced 2026-01-29 01:13:01 +01:00
nvim: use it in git as default editor
This commit is contained in:
parent
7e0f290957
commit
e2a098ce82
1 changed files with 4 additions and 4 deletions
|
|
@ -8,10 +8,10 @@
|
|||
email = account@buehler.rocks
|
||||
[merge]
|
||||
defaultToUpstream = true
|
||||
tool = vimdiff
|
||||
tool = nvim -d
|
||||
conflictstyle = zdiff3
|
||||
[core]
|
||||
editor = vim
|
||||
editor = nvim
|
||||
eol = native
|
||||
pager = delta || (diff-so-fancy | less --tabs=4 -RFX)
|
||||
quotepath = false
|
||||
|
|
@ -46,8 +46,8 @@
|
|||
fetch = +refs/pull/*/head:refs/remotes/upstream/pull/*
|
||||
fetch = +refs/merge-requests/*/head:refs/remotes/upstream/merge-requests/*
|
||||
[diff]
|
||||
tool = vimdiff
|
||||
colorMoved = plain
|
||||
tool = nvim -d
|
||||
colorMoved = default
|
||||
algorithm = histogram
|
||||
mnemonicPrefix = true
|
||||
renames = true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue