Make nvim be the core, diff and merge editor
dblume commited on 2024-04-02 20:09:09
Showing 1 changed files, with 5 additions and 1 deletions.
Haven't really tested 3-way merge with nvim. Fingers crossed.
- .gitconfig f8222ad..a24ff0a
| ... | ... |
@@ -8,6 +8,8 @@ |
| 8 | 8 |
algorithm = histogram |
| 9 | 9 |
[difftool] |
| 10 | 10 |
prompt = false |
| 11 |
+[difftool "vimdiff"] |
|
| 12 |
+ path = nvim |
|
| 11 | 13 |
[color "blame"] |
| 12 | 14 |
highlightRecent = 239, 18 month ago, 240, 17 month ago, 241, 16 month ago, 242, 15 month ago, 243, 14 month ago, 244, 13 month ago, 245, 12 month ago, 246, 11 month ago, 247, 10 month ago, 248, 9 month ago, 249, 8 month ago, 250, 7 month ago, 251, 6 month ago, 252, 5 month ago, 253, 4 month ago, 254, 3 month ago, 231, 2 month ago, 230, 1 month ago, 229, 3 weeks ago, 228, 2 weeks ago, 227, 1 week ago, 226 |
| 13 | 15 |
[blame] |
| ... | ... |
@@ -18,7 +20,7 @@ |
| 18 | 20 |
default = simple |
| 19 | 21 |
autoSetupRemote = true |
| 20 | 22 |
[core] |
| 21 |
- editor = vim |
|
| 23 |
+ editor = nvim |
|
| 22 | 24 |
excludesfile = ~/.gitignore |
| 23 | 25 |
whitespace = trailing-space,space-before-tab,tab-in-indent |
| 24 | 26 |
[alias] |
| ... | ... |
@@ -35,6 +37,8 @@ |
| 35 | 37 |
[merge] |
| 36 | 38 |
tool = vimdiff |
| 37 | 39 |
conflictstyle = diff3 |
| 40 |
+[mergetool "vimdiff"] |
|
| 41 |
+ path = nvim |
|
| 38 | 42 |
[tag] |
| 39 | 43 |
sort = -creatordate |
| 40 | 44 |
[grep] |
| 41 | 45 |