bat-extras: batdiff

May 16, 2023 ยท View on GitHub

Diff a file against the current git index, or display the diff between two files.

This script supports using delta as an alternative highlighter for diffs.

Usage

batdiff [OPTIONS] FILE
batdiff [OPTIONS] FILE OTHER_FILE
batdiff --staged

Environment

VariableDescription
BATDIFF_USE_DELTA=trueIf delta is installed, use delta by default.

Options

ShortLongDescription
-C--context=[LINES]The number of lines to show before and after the differing lines.
--deltaDisplay diffs using delta.
--colorForce color output.
--no-colorForce disable color output.
--paging=["never"/"always"]Enable/disable paging.
--pager=[PAGER]Specify the pager to use.
--terminal-width=[COLS]Generate output for the specified terminal width.
--stagedShow staged changes.

Installation

This script is a part of the bat-extras suite of scripts. You can find install instructions here.

Caveats

When using bat as the printer:

  • Syntax highlighting in diffs between two files is not supported.
  • Syntax highlighting in a single-file diff requires bat >= 0.15.

When using delta as the printer:

  • The --no-color option does not remove all color output.

Issues?

If you find an issue or have a feature suggestion, make a pull request or issue through GitHub! Contributions are always welcome.