mirror of
https://github.com/Stunkymonkey/dotfiles.git
synced 2026-01-29 09:23:02 +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
|
email = account@buehler.rocks
|
||||||
[merge]
|
[merge]
|
||||||
defaultToUpstream = true
|
defaultToUpstream = true
|
||||||
tool = vimdiff
|
tool = nvim -d
|
||||||
conflictstyle = zdiff3
|
conflictstyle = zdiff3
|
||||||
[core]
|
[core]
|
||||||
editor = vim
|
editor = nvim
|
||||||
eol = native
|
eol = native
|
||||||
pager = delta || (diff-so-fancy | less --tabs=4 -RFX)
|
pager = delta || (diff-so-fancy | less --tabs=4 -RFX)
|
||||||
quotepath = false
|
quotepath = false
|
||||||
|
|
@ -46,8 +46,8 @@
|
||||||
fetch = +refs/pull/*/head:refs/remotes/upstream/pull/*
|
fetch = +refs/pull/*/head:refs/remotes/upstream/pull/*
|
||||||
fetch = +refs/merge-requests/*/head:refs/remotes/upstream/merge-requests/*
|
fetch = +refs/merge-requests/*/head:refs/remotes/upstream/merge-requests/*
|
||||||
[diff]
|
[diff]
|
||||||
tool = vimdiff
|
tool = nvim -d
|
||||||
colorMoved = plain
|
colorMoved = default
|
||||||
algorithm = histogram
|
algorithm = histogram
|
||||||
mnemonicPrefix = true
|
mnemonicPrefix = true
|
||||||
renames = true
|
renames = true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue