[![Build Status](https://travis-ci.com/dandavison/delta.svg?branch=master)](https://travis-ci.com/dandavison/delta) [![Gitter](https://badges.gitter.im/dandavison-delta/community.svg)](https://gitter.im/dandavison-delta/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) ## A syntax-highlighter for git and diff output Delta provides language syntax-highlighting, within-line insertion/deletion detection, and restructured diff output for git on the command line. Here's what `git show` looks like when git is configured to use delta as its pager:
image image
"Dracula" theme "GitHub" theme


**By default, delta restructures the git output slightly to make the hunk markers human-readable:**
image


**All the syntax-highlighting color themes that are available with [bat](https://github.com/sharkdp/bat/) are available with delta:**
image image
delta --list-themes --dark delta --list-themes --light

## Features | | delta | git | [diff-so-fancy] /
[diff-highlight] | github/gitlab | |------------------------------------------------|-------|-----|---------------------------------------|---------------| | language syntax highlighting | ✅ | ❌ | ❌ | ✅ | | within-line insertion/deletion detection | ✅ | ❌ | ✅ | ✅ | | multiple insertion/deletions detected per line | ✅ | ❌ | ❌ | ✅ | | matching of unequal numbers of changed lines | ✅ | ❌ | ❌ | ❌ | In addition, delta handles traditional unified diff output. [diff-so-fancy]: https://github.com/so-fancy/diff-so-fancy [diff-highlight]: https://github.com/git/git/tree/master/contrib/diff-highlight ## Installation You can download an executable for your system: [Linux](https://github.com/dandavison/delta/releases/download/0.1.1/delta-0.1.1-x86_64-unknown-linux-musl.tar.gz) | [MacOS](https://github.com/dandavison/delta/releases/download/0.1.1/delta-0.1.1-x86_64-apple-darwin.tar.gz) | [Windows](https://github.com/dandavison/delta/releases/download/0.1.1/delta-0.1.1-x86_64-pc-windows-gnu.zip) | [All](https://github.com/dandavison/delta/releases) Alternatively, delta is available in the following package managers:
Arch Linux (AUR) yay -S git-delta
or
git clone https://aur.archlinux.org/git-delta.git
cd git-delta
makepkg -csri
Debian
.deb files are on the releases page and at barnumbirr/delta-debian
dpkg -i file.deb
Fedora dnf install git-delta
FreeBSD pkg install git-delta
Homebrew brew install git-delta
MacPorts port install git-delta
Nix nix-env -iA nixpkgs.gitAndTools.delta
Windows (Chocolatey) choco install delta
## Configure git to use delta Set delta to be git's pager in your `.gitconfig`. Delta accepts many command line options to alter colors and other details of the output. An example is ``` [core] pager = delta --plus-color="#012800" --minus-color="#340001" --theme='Monokai Extended' [interactive] diffFilter = delta --color-only ``` Note that delta argument values in ~/.gitconfig should be in double quotes, like `--minus-color="#340001"`. For a theme name containing a space, use single quotes, like `--theme='Monokai Extended'`. All git commands that display diff output should now display syntax-highlighted output. For example: - `git diff` - `git show` - `git log -p` - `git stash show -p` - `git reflog -p` - `git add -p` Delta also handles unified diff output: ``` diff -u a.txt b.txt | delta ``` ## Supported languages and themes To list the supported languages and color themes, use `delta --list-languages` and `delta --list-theme-names`. To see a demo of the color themes, use `delta --list-themes`: To add your own custom color theme, or language, please follow the instructions in the Customization section of the [bat documentation](https://github.com/sharkdp/bat/#customization): - [Adding a custom language](https://github.com/sharkdp/bat/#adding-new-syntaxes--language-definitions) - [Adding a custom theme](https://github.com/sharkdp/bat/#adding-new-themes) Delta automatically recognizes custom themes and languages added to bat. You will need to install bat in order to run the `bat cache --build` command. The languages and color themes that ship with delta are those that ship with bat. So, to propose a new language or color theme for inclusion in delta, it would need to be a helpful addition to bat, in which case please open a PR against bat. ## 24 bit color (truecolor) Delta looks best if your terminal application supports 24 bit colors. See https://gist.github.com/XVilka/8346728. For example, on MacOS, iTerm2 supports 24-bit colors but Terminal.app does not. If your terminal application does not support 24-bit color, delta will still work, by automatically choosing the closest color from those available. See the `Colors` section of the help output below. If you're using tmux, it's worth checking that 24 bit color is working correctly. For example, run a color test script like [this one](https://gist.githubusercontent.com/lifepillar/09a44b8cf0f9397465614e622979107f/raw/24-bit-color.sh), or one of the others listed [here](https://gist.github.com/XVilka/8346728). If you do not see smooth color gradients, see the discussion at [tmux#696](https://github.com/tmux/tmux/issues/696). The short version is you need something like this in your `~/.tmux.conf`: ``` set -ga terminal-overrides ",xterm-256color:Tc" ``` and you may then need to quit tmux completely for it to take effect. ## Windows Delta works with Windows. However, the `less.exe` installed with git doesn't work well with `delta`. A patched version of `less.exe` and instructions for installing can be found [here](https://github.com/lzybkr/less/releases/tag/fix_windows_vt). ## Mouse scrolling If mouse scrolling is broken, try setting your `BAT_PAGER` environment variable to (at least) `less -R` . See [issue #58](https://github.com/dandavison/delta/issues/58) and [bat README / "Using a different pager"](https://github.com/sharkdp/bat#using-a-different-pager). ## Using delta with Magit Delta can be used when displaying diffs in the Magit git client: see [magit-delta](https://github.com/dandavison/magit-delta). Here's a screenshot:
image
## Mercurial Add delta to the `[pager]` section of `.hgrc`, the same way as `~/.gitconfig`. ## Options Here's the output of `delta --help`. To use these options, add them to the delta command line in your `.gitconfig` file. ``` USAGE: delta [FLAGS] [OPTIONS] FLAGS: --color-only Do not alter the input in any way other than applying colors. Equivalent to `--keep-plus-minus-markers --width variable --tabs 0 --commit-style plain --file- style plain --hunk-style plain`. --dark Use default colors appropriate for a dark terminal background. For more control, see the other color options. -h, --help Prints help information --highlight-removed Apply syntax highlighting to removed lines. The default is to apply syntax highlighting to unchanged and new lines only. --keep-plus-minus-markers Prefix added/removed lines with a +/- character, respectively, exactly as git does. The default behavior is to output a space character in place of these markers. --light Use default colors appropriate for a light terminal background. For more control, see the other color options. --list-languages List supported languages and associated file extensions. --list-theme-names List available syntax-highlighting color themes. --list-themes List available syntax highlighting themes, each with an example of highlighted diff output. If diff output is supplied on standard input then this will be used for the demo. For example: `git show --color=always | delta --list-themes`. --show-background-colors Show the command-line arguments (RGB hex codes) for the background colors that are in effect. The hex codes are displayed with their associated background color. This option can be combined with --light and --dark to view the background colors for those modes. It can also be used to experiment with different RGB hex codes by combining this option with --minus-color, --minus-emph-color, --plus-color, --plus- emph-color. -V, --version Prints version information OPTIONS: --commit-color Color for the commit section of git output. [default: yellow] --commit-style Formatting style for the commit section of git output. Options are: plain, box. [default: plain] --file-color Color for the file section of git output. [default: blue] --file-style Formatting style for the file section of git output. Options are: plain, box, underline. [default: underline] --hunk-color Color for the hunk-marker section of git output. [default: blue] --hunk-style Formatting style for the hunk-marker section of git output. Options are: plain, box. [default: box] --max-line-distance The maximum distance between two lines for them to be inferred to be homologous. Homologous line pairs are highlighted according to the deletion and insertion operations transforming one into the other. [default: 0.3] --minus-color The background color to use for removed lines. --minus-emph-color The background color to use for emphasized sections of removed lines. --paging Whether to use a pager when displaying output. Options are: auto, always, and never. The default pager is `less`: this can be altered by setting the environment variables BAT_PAGER or PAGER (BAT_PAGER has priority). [default: auto] --plus-color The background color to use for added lines. --plus-emph-color The background color to use for emphasized sections of added lines. --tabs The number of spaces to replace tab characters with. Use --tabs=0 to pass tab characters through directly, but note that in that case delta will calculate line widths assuming tabs occupy one character's width on the screen: if your terminal renders tabs as more than than one character wide then delta's output will look incorrect. [default: 4] --theme The code syntax highlighting theme to use. Use --theme=none to disable syntax highlighting. If the theme is not set using this option, it will be taken from the BAT_THEME environment variable, if that contains a valid theme name. Use --list-themes to view available themes. Note that the choice of theme only affects code syntax highlighting. See --commit-color, --file-color, --hunk-color to configure the colors of other parts of the diff output. [env: BAT_THEME=base16] --24-bit-color Whether to emit 24-bit ("true color") RGB color codes. Options are auto, always, and never. "auto" means that delta will emit 24-bit color codes iff the environment variable COLORTERM has the value "truecolor" or "24bit". If your terminal application (the application you use to enter commands at a shell prompt) supports 24 bit colors, then it probably already sets this environment variable, in which case you don't need to do anything. [default: auto] -w, --width The width (in characters) of the background color highlighting. By default, the width is the current terminal width. Use --width=variable to apply background colors to the end of each line, without right padding to equal width. Colors ------ All delta color options work the same way. There are three ways to specify a color: 1. RGB hex code An example of using an RGB hex code is: --file-color="#0e7c0e" 2. ANSI color name There are 8 ANSI color names: black, red, green, yellow, blue, magenta, cyan, white. In addition, all of them have a bright form: bright-black, bright-red, bright-green, bright-yellow, bright-blue, bright-magenta, bright-cyan, bright-white An example of using an ANSI color name is: --file-color="green" Unlike RGB hex codes, ANSI color names are just names: you can choose the exact color that each name corresponds to in the settings of your terminal application (the application you use to enter commands at a shell prompt). This means that if you use ANSI color names, and you change the color theme used by your terminal, then delta's colors will respond automatically, without needing to change the delta command line. "purple" is accepted as a synonym for "magenta". Color names and codes are case-insensitive. 3. ANSI color number An example of using an ANSI color number is: --file-color=28 There are 256 ANSI color numbers: 0-255. The first 16 are the same as the colors described in the "ANSI color name" section above. See https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit. Specifying colors like this is useful if your terminal only supports 256 colors (i.e. doesn't support 24-bit color). ```
## Comparisons (`delta --light`)
delta vs. git image image
delta vs. diff-so-fancy /
diff-highlight
image image
delta vs. github image image
## Build delta from source You'll need to [install the rust tools](https://www.rust-lang.org/learn/get-started). Then: ``` cargo build --release ``` and use the executable found at `./target/release/delta`. ## Credit - [ogham/rust-ansi-term](https://github.com/ogham/rust-ansi-term) - [sharkdp/bat](https://github.com/sharkdp/bat) - [so-fancy/diff-so-fancy](https://github.com/so-fancy/diff-so-fancy) - [trishume/syntect](https://github.com/trishume/syntect) ## Projects using delta - [wfxr/forgit](https://github.com/wfxr/forgit) - [bigH/git-fuzzy](https://github.com/bigH/git-fuzzy) - [dandavison/magit-delta](https://github.com/dandavison/magit-delta) - [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit/) - [ms-jpq/sad](https://github.com/ms-jpq/sad)