From a1f33472f9f2b3d0721d254489b31ba7ebe4ba1c Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Mon, 14 Dec 2020 10:33:18 +0900 Subject: [PATCH] delta --no-gitconfig Close #1205 --- autoload/fzf/vim.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/fzf/vim.vim b/autoload/fzf/vim.vim index b56a2a6..ccab37d 100644 --- a/autoload/fzf/vim.vim +++ b/autoload/fzf/vim.vim @@ -626,7 +626,7 @@ function! fzf#vim#gitfiles(args, ...) let preview = printf( \ 'bash -c "if [[ {1} =~ M ]]; then %s; else %s {-1}; fi"', \ executable('delta') - \ ? 'git diff -- {-1} | delta --file-style=omit | sed 1d' + \ ? 'git diff -- {-1} | delta --no-gitconfig --file-style=omit | sed 1d' \ : 'git diff --color=always -- {-1} | sed 1,4d', \ s:bin.preview) let wrapped = fzf#wrap({ @@ -1221,7 +1221,7 @@ function! s:commits(buffer_local, args) endif if !s:is_win && &columns > s:wide - let suffix = executable('delta') ? '| delta' : '--color=always' + let suffix = executable('delta') ? '| delta --no-gitconfig' : '--color=always' call extend(options.options, \ ['--preview', 'echo {} | grep -o "[a-f0-9]\{7,\}" | head -1 | xargs git show --format=format: ' . suffix]) endif