From 77490118b5af131a86bf392190e9e183f70cec12 Mon Sep 17 00:00:00 2001 From: Alex Karle Date: Mon, 21 Feb 2022 22:15:48 -0500 Subject: [PATCH] git: Add support for nvim as the vimdiff tool Since nvim has no vimdiff(1) executable, it's necessary to spoof it using the path (mostly because git-difftool(1) doesn't allow arbitrary commands, so it doesn't support `nvim -d`). --- .gitconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitconfig b/.gitconfig index 79e521c..911545f 100644 --- a/.gitconfig +++ b/.gitconfig @@ -7,6 +7,10 @@ [diff] tool = vimdiff + +[difftool.vimdiff] + path = nvim + [color] ui = false -- libgit2 1.1.1