diff options
| author | Brahmajit Das <brahmajit.xyz@gmail.com> | 2023-07-30 13:23:20 +0530 |
|---|---|---|
| committer | Brahmajit Das <brahmajit.xyz@gmail.com> | 2023-07-30 13:23:20 +0530 |
| commit | fcbd7783f420ccda7d43e516e676251b4ec82452 (patch) | |
| tree | 318c30fafb7bfbdd51026e96eda453549881b3f8 | |
| parent | 613e2264568f96445ee29f553fc621f1e2b2b4ba (diff) | |
git: use different configs for merge and diff tools
Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
| -rw-r--r-- | .config/git/config | 6 |
1 files changed, 4 insertions, 2 deletions
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 |