From 6bf96f24c6483efd306c0eb367d4ddc4df0d423b Mon Sep 17 00:00:00 2001 From: Daniel Weipert Date: Thu, 20 Jan 2022 12:31:47 +0100 Subject: Uses nvim as git difftool --- .gitconfig | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitconfig b/.gitconfig index 1fb153a..754ecd2 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,5 +1,14 @@ [init] - defaultBranch = main + defaultBranch = main + [user] - name = Daniel Weipert - email = code@drogueronin.de + name = Daniel Weipert + email = code@drogueronin.de + +[diff] + tool = nvimdiff +[difftool] + prompt = false +[difftool "nvimdiff"] + cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"" + -- cgit v1.2.3