git: set vim as editor
This commit is contained in:
parent
8ed1404931
commit
a8d255a6f5
1 changed files with 2 additions and 2 deletions
|
@ -26,7 +26,7 @@
|
||||||
helper = libsecret
|
helper = libsecret
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
editor = nvim
|
editor = vim
|
||||||
pager = delta
|
pager = delta
|
||||||
excludesfile = ~/.config/git/ignore
|
excludesfile = ~/.config/git/ignore
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
line-numbers = true
|
line-numbers = true
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = nvimdiff
|
tool = vimdiff
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
|
|
Loading…
Add table
Reference in a new issue