Skip to content

Diffλ︎

Compare differences between different files or between a file and its versions.

:diffsplit filename Neovim command opens a split containing the selected filename, showing a diff comparision to the currently opened file

file path completion helps select the correct file for comparison

Git Diffλ︎

DiffView compares working space and staged changes side by side, or a diff for git merge conflicts.

++SPC++ g d or d in neogit status buffer (SPC g s) will open diffview in a new tab

q to return to neogit status buffer

Neovim diffview plugin - side by side view of changes in git for local working directory and staging

  • Green - added lines
  • Yellow - changed line
  • Red - deleted lines

Ctrl h / j / k / l to navigate between open splits

SPC b toggles the sidebar buffer

SPC w l and SPC w h to move cursor between diff buffer and sidebar buffer

Neovim diffview plugin - side by side view of changes in git for local working directory and staging