From 1f70aafdad61486592e9fdbca6907a043540ae61 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 11 Mar 2021 17:30:21 +0100 Subject: [PATCH] Add neovim as difftool for git --- gitconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gitconfig b/gitconfig index 92d0657465..2644dfe946 100644 --- a/gitconfig +++ b/gitconfig @@ -47,8 +47,16 @@ [branch "master"] mergeoptions = --no-edit + [user] email = soler.thomas.06@gmail.com name = Thomas + [credential "https://github.com"] helper = !gh auth git-credential + +[diff] + tool = nvimdiff + +[difftool "nvimdiff"] + cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""