A syntax-highlighting pager for git, diff, and grep output
Go to file
2024-11-04 22:55:21 +01:00
.cargo Ignore RUSTSEC-2020-0071 2021-10-26 12:04:29 -04:00
.github CI: switch to macos-13, as 12 will be unsupported soon 2024-11-04 22:55:21 +01:00
etc Update release Makefile 2024-09-11 08:51:11 -04:00
manual Recommend zdiff3 merge.conflictStyle (#1260) 2024-10-29 17:12:31 -04:00
src Refactor (#1877) 2024-10-21 18:22:21 -04:00
tests Fix hyperlink absolute paths (#939) 2022-02-14 12:30:30 -05:00
.gitattributes add .gitattributes rules for rust files (#1245) 2024-03-17 14:08:50 -04:00
.gitignore gitignore: add pending insta snapshots 2024-07-09 00:00:18 +01:00
ARCHITECTURE.md Fix github links from master to main (#1709) 2024-07-12 08:04:06 +01:00
Cargo.lock Bump version 2024-09-11 08:29:53 -04:00
Cargo.toml Bump version 2024-09-11 08:29:53 -04:00
CONTRIBUTING.md Edit CONTRIBUTING.md 2022-09-06 19:39:47 -04:00
LICENSE Edit license: exactly match https://opensource.org/licenses/MIT 2020-04-27 11:19:43 -04:00
Makefile Delete unused Makefile target 2024-09-06 19:30:08 -04:00
README.md Recommend zdiff3 merge.conflictStyle (#1260) 2024-10-29 17:12:31 -04:00
themes.gitconfig Add themes weeping-willow, mirthful-willow (#1864) 2024-10-31 19:27:54 -04:00

image

CI Coverage Status Gitter

Get Started

Install it (the package is called "git-delta" in most package managers, but the executable is just delta) and add this to your ~/.gitconfig:

[core]
    pager = delta

[interactive]
    diffFilter = delta --color-only

[delta]
    navigate = true    # use n and N to move between diff sections

    # delta detects terminal colors automatically; set one of these to disable auto-detection
    # dark = true
    # light = true

[merge]
    conflictstyle = zdiff3

Delta has many features and is very customizable; please see the user manual.

Features

  • Language syntax highlighting with the same syntax-highlighting themes as bat
  • Word-level diff highlighting using a Levenshtein edit inference algorithm
  • Side-by-side view with line-wrapping
  • Line numbering
  • n and N keybindings to move between files in large diffs, and between diffs in log -p views (--navigate)
  • Improved merge conflict display
  • Improved git blame display (syntax highlighting; --hyperlinks formats commits as links to hosting provider etc. Supported hosting providers are: GitHub, GitLab, SourceHut, Codeberg)
  • Syntax-highlights grep output from rg, git grep, grep, etc
  • Support for Git's --color-moved feature.
  • Code can be copied directly from the diff (-/+ markers are removed by default).
  • diff-highlight and diff-so-fancy emulation modes
  • Commit hashes can be formatted as terminal hyperlinks to the hosting provider page (--hyperlinks). File paths can also be formatted as hyperlinks for opening in your OS.
  • Stylable box/line decorations to draw attention to commit, file and hunk header sections.
  • Style strings (foreground color, background color, font attributes) are supported for >20 stylable elements, using the same color/style language as git
  • Handles traditional unified diff output in addition to git output
  • Automatic detection of light/dark terminal background

A syntax-highlighting pager for git, diff, and grep output

Code evolves, and we all spend time studying diffs. Delta aims to make this both efficient and enjoyable: it allows you to make extensive changes to the layout and styling of diffs, as well as allowing you to stay arbitrarily close to the default git/diff output.

image
delta with line-numbers activated
image
delta with side-by-side and line-numbers activated

Here's what git show can look like with git configured to use delta:


image image
"Dracula" theme "GitHub" theme


Syntax-highlighting themes

All the syntax-highlighting color themes that are available with bat are available with delta:


image image
delta --show-syntax-themes --dark delta --show-syntax-themes --light

Side-by-side view

[User manual]

[delta]
    side-by-side = true

By default, side-by-side view has line-numbers activated, and has syntax highlighting in both the left and right panels: [config]

image

Side-by-side view wraps long lines automatically:

image

Line numbers

[User manual]

[delta]
    line-numbers = true
image

Merge conflicts

[User manual]

image

Git blame

[User manual]

image

Ripgrep, git grep

[User manual]

image

Installation and usage

Please see the user manual and delta --help.

Maintainers