From fcbd7783f420ccda7d43e516e676251b4ec82452 Mon Sep 17 00:00:00 2001 From: Brahmajit Das Date: Sun, 30 Jul 2023 13:23:20 +0530 Subject: git: use different configs for merge and diff tools Signed-off-by: Brahmajit Das --- .config/git/config | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to '.config/git') diff --git a/.config/git/config b/.config/git/config index aa7efef..e7cf850 100644 --- a/.config/git/config +++ b/.config/git/config @@ -9,11 +9,13 @@ [mergetool] prompt = true [mergetool "vimdiff"] - cmd = nvim --noplugin -u ~/.config/nvim/init_min.lua -d $LOCAL $REMOTE + cmd = nvim --noplugin -u ~/.config/nvim/init_min.lua -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' [difftool] prompt = false [diff] - tool = vimdiff + tool = nvimdiff +[difftool "nvimdiff"] + cmd = nvim --noplugin -u ~/.config/nvim/init_min.lua -d $LOCAL $REMOTE [user] email = brahmajit.xyz@gmail.com name = Brahmajit Das -- cgit v1.2.3