diff --git a/nvim/.config/nvim/after/ftplugin/git.vim b/nvim/.config/nvim/after/ftplugin/git.vim index 0d775b0..c5e4504 100644 --- a/nvim/.config/nvim/after/ftplugin/git.vim +++ b/nvim/.config/nvim/after/ftplugin/git.vim @@ -4,8 +4,7 @@ nnoremap gb :call git#git_branch_checkout() nnoremap gB :call git#git_branch_delete() nnoremap gc :call git#git_cherry_pick() xnoremap gC :call git#git_cherry_pick_range() -nnoremap gd :call git#git_diffview_commit() -nnoremap gD :call git#git_diff_commit() +nnoremap gd :call git#git_diff_commit() nnoremap gl :call git#git_branch_log() nnoremap gL :call git#git_branch_log_pretty() nnoremap gr :call git#git_rebase_branch() diff --git a/nvim/.config/nvim/autoload/git.vim b/nvim/.config/nvim/autoload/git.vim index 060c555..55c9bfb 100644 --- a/nvim/.config/nvim/autoload/git.vim +++ b/nvim/.config/nvim/autoload/git.vim @@ -110,15 +110,6 @@ function! git#git_diff_commit() abort silent execute "Git difftool -y " . commit[1] . "^!" endfunction -" Run DiffviewOpen on the commit in the line which we are at. To be used after -" running some variation of Git log. -function! git#git_diffview_commit() abort - " A line in Git log is of the form commit - let line = trim(getline('.')) - let commit = split(line, " ") - silent execute "DiffviewOpen " . commit[1] . "^!" -endfunction - " The next two functions allow scoping diffs by line range of a file and named " block in a file. Inspired by reading the following article. " https://susanpotter.net/software/tracking-diffs-by-scoping-to-file-range-function-method-or-class-changes-in-git/ diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index ecdd0ab..c29e778 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -35,7 +35,6 @@ local init = function () use 'tpope/vim-fugitive' use 'rhysd/git-messenger.vim' use 'whiteinge/diffconflicts' - use 'sindrets/diffview.nvim' -- Boost vim command line mode use 'vim-utils/vim-husk' -- Quickfix