dandavison/delta
1
1
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2024-10-04 11:57:15 +03:00
Code Issues Projects Releases Wiki Activity
A syntax-highlighting pager for git, diff, and grep output
2,055 Commits 80 Branches 64 Tags 18 MiB
Rust 97.4%
Shell 2%
Makefile 0.5%
Ruby 0.1%
6205118b85
Go to file
Thomas Otto 6205118b85 Add truncate_str_short() which always returns a prefix of the input 
Document that the input of `truncate_str()` may be cut on a double width
char ("fullwidth") - then the output is no longer a prefix of the input.

`truncate_str_short()` could be faster by not constructing the result and
instead only returning an index, but it will be used in rare edge cases so
reusing existing logic is good enough.

Common code moved to `truncate_str_impl()`.

Assume (with fallback) that graphemes are at most 2 wide.
Fewer allocations.
Tests.
2024-07-22 02:54:31 +01:00
.cargo Ignore RUSTSEC-2020-0071 2021-10-26 12:04:29 -04:00
.github CI: fix macOS build (#1696) 2024-05-06 19:39:19 -04:00
etc Only use nosort in bash <4.4 (#1683) 2024-05-10 13:05:29 -04:00
HomeBrewFormula Bump version in private Homebrew formula 2022-12-03 09:33:41 -08:00
manual Fix github links from master to main (#1709) 2024-07-12 08:04:06 +01:00
src Add truncate_str_short() which always returns a prefix of the input 2024-07-22 02:54:31 +01: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 Update syntect to 5.2.0 (#1672) 2024-07-17 10:23:46 -04:00
Cargo.toml Update terminal-colorsaurus (#1699) 2024-07-16 13:39:59 -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 feat: generate completion subcommand (#1561) 2023-11-19 10:20:52 -05:00
README.md Add documentation help regarding autodetection and light/dark settings 2024-03-22 07:34:34 -04:00
themes.gitconfig Add corvus theme (#1652) 2024-03-11 22:39:30 -04:00

README.md

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 = diff3

[diff]
    colorMoved = default

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.