sindrets/diffview.nvim
Diffview.nvim
diffview.nvim is a Git diff tool for Neovim that provides a dedicated interface for visualizing and managing differences across files and revisions. It functions as a revision browser and history tracker, allowing users to compare the working tree or index against specific Git tags, branches, or commits.
The project includes specialized utilities for managing the Git index, such as a stage manager for staging specific diff hunks directly from a buffer. It also features a multi-way diff layout for resolving merge conflicts by comparing target and source branches during merges or rebases.
Beyond basic diffing, the tool covers file history tracing and version restoration, enabling users to list commits for specific paths and revert files to previous historical states.
Features
- Git Diff Viewers - Provides a dedicated Neovim interface for visualizing and managing Git diffs across files and revisions.
- Revision Comparison - Provides a dedicated interface to compare the working tree or index against specific Git tags, branches, or commits.
- Index Staging Operations - Updates the git index by editing and staging specific diff hunks directly from a visual view.
- Git History Navigation - Lists commits affecting specific paths and traces the history of line ranges across the project.
- File Evolution Tracking - Traces the evolution of specific files and line ranges across multiple commits using logs.
- Buffer-Based Hunk Staging - Provides a buffer-based interface for staging specific diff hunks to the Git index directly from a diff view.
- Git Command Execution - Executes git shell commands to fetch file contents and diff data from the version control system.
- Buffer-Based Hunk Staging - Performs direct index updates by editing buffers that represent the Git index within the diff view.
- File Restoration - Allows reverting a file to a previous state based on specific versions displayed in a diff split.
- Merge Conflict Resolution - Compares branch versions using a multi-way diff layout to settle conflicts during merges or rebases.
- Conflict Resolution Editors - Implements a multi-way diff layout for comparing target and source branches to settle conflicts during merges.
- Composite Diff Buffers - Represents git diffs using composite buffers to allow direct modification of the index and working tree.
- Version Control Utilities - Provides capabilities for restoring previous file states and browsing historical revisions.
- Synchronized Diff Layouts - Coordinates multiple split windows to synchronize scrolling and display versions of files from different git revisions.
