From 2e7b5c5fa38e405037d3ae98e2f318ede32a2970 Mon Sep 17 00:00:00 2001 From: yeti Date: Thu, 15 May 2025 16:49:32 +0100 Subject: [PATCH] feat(git): add configuration for git difftool --- gitconfig.template | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gitconfig.template b/gitconfig.template index dd1b81c..f1d5901 100644 --- a/gitconfig.template +++ b/gitconfig.template @@ -2,6 +2,16 @@ name = ${GIT_NAME} email = ${GIT_EMAIL} +[diff] + tool = nvimdiff + +[difftool] + prompt = false # don’t ask “launch nvim?” each time + +[difftool "nvimdiff"] + cmd = nvim -d "$LOCAL" "$REMOTE" + trustExitCode = true + [alias] co = checkout st = status