Deploying to gh-pages from @ dandavison/delta@07b70e50a3b6e0e252d2f7c205cbc28ee709f3ac 🚀

12 files changed, 56 insertions, 18 deletions

diff --git a/choosing-colors-styles.html b/choosing-colors-styles.html
index 37d8243c..660dbf40 100644
--- a/choosing-colors-styles.html
+++ b/choosing-colors-styles.html
@@ -143,7 +143,7 @@ https://git-scm.com/docs/git-config#Documentation/git-config.txt-color</p>
     minus-style = red bold ul &quot;#ffeeee&quot;
 </code></pre>
 <p>That means: For removed lines, set the foreground (text) color to 'red', make it bold and underlined, and set the background color to <code>#ffeeee</code>.</p>
-<p>For full details, see the <code>STYLES</code> section in <a href="#full---help-output"><code>delta --help</code></a>.</p>
+<p>For full details, see the <code>STYLES</code> section in <a href="./full---help-output.html"><code>delta --help</code></a>.</p>
 
                     </main>
 
diff --git a/custom-themes.html b/custom-themes.html
index 696c5d52..f269be35 100644
--- a/custom-themes.html
+++ b/custom-themes.html
@@ -135,7 +135,7 @@
                 <div id="content" class="content">
                     <main>
                         <h1 id="custom-themes"><a class="header" href="#custom-themes">Custom themes</a></h1>
-<p>A &quot;theme&quot; in delta is just a collection of settings grouped together in a named <a href="#features-named-groups-of-settings">feature</a>. One of the available settings is <code>syntax-theme</code>: this dictates the colors and styles that are applied to foreground text by the syntax highlighter. Thus the concept of &quot;theme&quot; in delta encompasses not just the foreground syntax-highlighting color theme, but also background colors, decorations such as boxes and under/overlines, etc.</p>
+<p>A &quot;theme&quot; in delta is just a collection of settings grouped together in a named <a href="./features-named-groups-of-settings.html">feature</a>. One of the available settings is <code>syntax-theme</code>: this dictates the colors and styles that are applied to foreground text by the syntax highlighter. Thus the concept of &quot;theme&quot; in delta encompasses not just the foreground syntax-highlighting color theme, but also background colors, decorations such as boxes and under/overlines, etc.</p>
 <p>The delta git repo contains a <a href="./themes.gitconfig">collection of themes</a> created by users. These focus on the visual appearance: colors etc. If you want features like <code>side-by-side</code> or <code>navigate</code>, you would set that yourself, after selecting the color theme. To use the delta themes, clone the delta repo (or download the <a href="./themes.gitconfig">themes.gitconfig</a> file) and add the following entry in your gitconfig:</p>
 <pre><code class="language-gitconfig">[include]
     path = /PATH/TO/delta/themes.gitconfig
diff --git a/get-started.html b/get-started.html
index 11d5a33b..6be2387c 100644
--- a/get-started.html
+++ b/get-started.html
@@ -135,7 +135,7 @@
                 <div id="content" class="content">
                     <main>
                         <h1 id="get-started"><a class="header" href="#get-started">Get started</a></h1>
-<p><a href="#installation">Install</a> delta and add this to your <code>~/.gitconfig</code>:</p>
+<p><a href="./installation.html">Install</a> delta and add this to your <code>~/.gitconfig</code>:</p>
 <pre><code class="language-gitconfig">[core]
     pager = delta
 
diff --git a/git-blame.html b/git-blame.html
index 626f3098..b574e44f 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -135,7 +135,7 @@
                 <div id="content" class="content">
                     <main>
                         <h1 id="git-blame"><a class="header" href="#git-blame">Git blame</a></h1>
-<p>Set delta as the pager for <code>blame</code> in the <code>[pager]</code> section of your gitconfig: see the <a href="#get-started">example gitconfig</a>.
+<p>Set delta as the pager for <code>blame</code> in the <code>[pager]</code> section of your gitconfig: see the <a href="./get-started.html">example gitconfig</a>.
 If <code>hyperlinks</code> is enabled in the <code>[delta]</code> section then each blame commit will link to the commit on GitHub/GitLab/Bitbucket/etc.</p>
 <table><tr><td><img width=600px src="https://user-images.githubusercontent.com/52205/141891376-1fdb87dc-1d9c-4ad6-9d72-eeb19a8aeb0b.png" alt="image" /></td></tr></table>
 
diff --git a/grep.html b/grep.html
index 6a151c24..d49dd4a5 100644
--- a/grep.html
+++ b/grep.html
@@ -136,7 +136,7 @@
                     <main>
                         <h1 id="grep"><a class="header" href="#grep">Grep</a></h1>
 <p>Delta applies syntax-highlighting and other enhancements to standard grep output such as from <code>git grep</code>, <a href="https://github.com/BurntSushi/ripgrep/">ripgrep</a> (aka <code>rg</code>), grep, etc.
-To use with <code>git grep</code>, set delta as the pager for <code>grep</code> in the <code>[pager]</code> section of your gitconfig. See the example at the <a href="#get-started">top of the page</a>.
+To use with <code>git grep</code>, set delta as the pager for <code>grep</code> in the <code>[pager]</code> section of your gitconfig. See the example at the <a href="./get-started.html">top of the page</a>.
 Output from other grep tools can be piped to delta: e.g. <code>rg -Hn --color=always</code>, <code>grep -Hn --color=always</code>, etc.
 To customize the colors and syntax highlighting, see <code>grep-match-line-style</code>, <code>grep-match-word-style</code>, <code>grep-contexct-line-style</code>, <code>grep-file-style</code>, <code>grep-line-number-style</code>.
 Ripgrep's <code>rg --json</code> output format is supported; this avoids certain file name parsing ambiguities that are inevitable with the standard grep output formats.
diff --git a/installation.html b/installation.html
index 48411449..271afdc4 100644
--- a/installation.html
+++ b/installation.html
@@ -210,7 +210,7 @@
 <p>Users of older MacOS versions (e.g. 10.11 El Capitan) should install using Homebrew, Cargo, or MacPorts: the binaries on the release page will not work.</p>
 <p>Behind the scenes, delta uses <a href="https://www.greenwoodsoftware.com/less/"><code>less</code></a> for paging.
 It's important to have a reasonably recent version of less installed.
-On MacOS, install <code>less</code> from Homebrew. For Windows, see <a href="#using-delta-on-windows">Using Delta on Windows</a>.</p>
+On MacOS, install <code>less</code> from Homebrew. For Windows, see <a href="./using-delta-on-windows.html">Using Delta on Windows</a>.</p>
 
                     </main>
 
diff --git a/line-numbers.html b/line-numbers.html
index 0f19aae2..c457e250 100644
--- a/line-numbers.html
+++ b/line-numbers.html
@@ -139,7 +139,7 @@
     line-numbers = true
 </code></pre>
 <table><tr><td><img width=400px src="https://user-images.githubusercontent.com/52205/86275526-76792100-bba1-11ea-9e78-6be9baa80b29.png" alt="image" /></td></tr></table>
-<p>The numbers are displayed in two columns and there are several configuration options: see the <code>LINE NUMBERS</code> section in <a href="#full---help-output"><code>delta --help</code></a> for details, and see the next section for an example of configuring line numbers.</p>
+<p>The numbers are displayed in two columns and there are several configuration options: see the <code>LINE NUMBERS</code> section in <a href="./full---help-output.html"><code>delta --help</code></a> for details, and see the next section for an example of configuring line numbers.</p>
 
                     </main>
 
diff --git a/print.html b/print.html
index b7190a24..466bfcc4 100644
--- a/print.html
+++ b/print.html
@@ -156,7 +156,7 @@
   </tr>
 </table>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="get-started"><a class="header" href="#get-started">Get started</a></h1>
-<p><a href="get-started.html#installation">Install</a> delta and add this to your <code>~/.gitconfig</code>:</p>
+<p><a href="./installation.html">Install</a> delta and add this to your <code>~/.gitconfig</code>:</p>
 <pre><code class="language-gitconfig">[core]
     pager = delta
 
@@ -277,7 +277,7 @@ File paths can also be formatted as hyperlinks for opening in your OS.</li>
 <p>Users of older MacOS versions (e.g. 10.11 El Capitan) should install using Homebrew, Cargo, or MacPorts: the binaries on the release page will not work.</p>
 <p>Behind the scenes, delta uses <a href="https://www.greenwoodsoftware.com/less/"><code>less</code></a> for paging.
 It's important to have a reasonably recent version of less installed.
-On MacOS, install <code>less</code> from Homebrew. For Windows, see <a href="installation.html#using-delta-on-windows">Using Delta on Windows</a>.</p>
+On MacOS, install <code>less</code> from Homebrew. For Windows, see <a href="./using-delta-on-windows.html">Using Delta on Windows</a>.</p>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="configuration"><a class="header" href="#configuration">Configuration</a></h1>
 <h2 id="git-config-file"><a class="header" href="#git-config-file">Git config file</a></h2>
 <p>The most convenient way to configure delta is with a <code>[delta]</code> section in <code>~/.gitconfig</code>. Here's an example:</p>
@@ -356,18 +356,18 @@ https://git-scm.com/docs/git-config#Documentation/git-config.txt-color</p>
     minus-style = red bold ul &quot;#ffeeee&quot;
 </code></pre>
 <p>That means: For removed lines, set the foreground (text) color to 'red', make it bold and underlined, and set the background color to <code>#ffeeee</code>.</p>
-<p>For full details, see the <code>STYLES</code> section in <a href="choosing-colors-styles.html#full---help-output"><code>delta --help</code></a>.</p>
+<p>For full details, see the <code>STYLES</code> section in <a href="./full---help-output.html"><code>delta --help</code></a>.</p>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="line-numbers"><a class="header" href="#line-numbers">Line numbers</a></h1>
 <pre><code class="language-gitconfig">[delta]
     line-numbers = true
 </code></pre>
 <table><tr><td><img width=400px src="https://user-images.githubusercontent.com/52205/86275526-76792100-bba1-11ea-9e78-6be9baa80b29.png" alt="image" /></td></tr></table>
-<p>The numbers are displayed in two columns and there are several configuration options: see the <code>LINE NUMBERS</code> section in <a href="line-numbers.html#full---help-output"><code>delta --help</code></a> for details, and see the next section for an example of configuring line numbers.</p>
+<p>The numbers are displayed in two columns and there are several configuration options: see the <code>LINE NUMBERS</code> section in <a href="./full---help-output.html"><code>delta --help</code></a> for details, and see the next section for an example of configuring line numbers.</p>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="side-by-side-view"><a class="header" href="#side-by-side-view">Side-by-side view</a></h1>
 <pre><code class="language-gitconfig">[delta]
     side-by-side = true
 </code></pre>
-<p>By default, side-by-side view has line-numbers activated, and has syntax highlighting in both the left and right panels: [<a href="side-by-side-view.html#side-by-side-view-1">config</a>]</p>
+<p>By default, side-by-side view has line-numbers activated, and has syntax highlighting in both the left and right panels: [<a href="./side-by-side-view-1.html">config</a>]</p>
 <table><tr><td><img width=800px src="https://user-images.githubusercontent.com/52205/87230973-412eb900-c381-11ea-8aec-cc200290bd1b.png" alt="image" /></td></tr></table>
 <p>To disable the line numbers in side-by-side view, but keep a vertical delimiter line between the left and right panels, use the line-numbers format options. For example:</p>
 <pre><code class="language-gitconfig">[delta]
@@ -383,7 +383,7 @@ In contrast, the long replacement line in the right panel overflows by almost an
 Line wrapping was implemented by @th1000s.</p>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="grep"><a class="header" href="#grep">Grep</a></h1>
 <p>Delta applies syntax-highlighting and other enhancements to standard grep output such as from <code>git grep</code>, <a href="https://github.com/BurntSushi/ripgrep/">ripgrep</a> (aka <code>rg</code>), grep, etc.
-To use with <code>git grep</code>, set delta as the pager for <code>grep</code> in the <code>[pager]</code> section of your gitconfig. See the example at the <a href="grep.html#get-started">top of the page</a>.
+To use with <code>git grep</code>, set delta as the pager for <code>grep</code> in the <code>[pager]</code> section of your gitconfig. See the example at the <a href="./get-started.html">top of the page</a>.
 Output from other grep tools can be piped to delta: e.g. <code>rg -Hn --color=always</code>, <code>grep -Hn --color=always</code>, etc.
 To customize the colors and syntax highlighting, see <code>grep-match-line-style</code>, <code>grep-match-word-style</code>, <code>grep-contexct-line-style</code>, <code>grep-file-style</code>, <code>grep-line-number-style</code>.
 Ripgrep's <code>rg --json</code> output format is supported; this avoids certain file name parsing ambiguities that are inevitable with the standard grep output formats.
@@ -412,7 +412,7 @@ Note that <code>git grep</code> can display the &quot;function context&quot; for
 </code></pre>
 <table><tr><td><img width=400px src="https://user-images.githubusercontent.com/52205/86275048-a96ee500-bba0-11ea-8a19-584f69758aee.png" alt="image" /></td></tr></table>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="custom-themes"><a class="header" href="#custom-themes">Custom themes</a></h1>
-<p>A &quot;theme&quot; in delta is just a collection of settings grouped together in a named <a href="custom-themes.html#features-named-groups-of-settings">feature</a>. One of the available settings is <code>syntax-theme</code>: this dictates the colors and styles that are applied to foreground text by the syntax highlighter. Thus the concept of &quot;theme&quot; in delta encompasses not just the foreground syntax-highlighting color theme, but also background colors, decorations such as boxes and under/overlines, etc.</p>
+<p>A &quot;theme&quot; in delta is just a collection of settings grouped together in a named <a href="./features-named-groups-of-settings.html">feature</a>. One of the available settings is <code>syntax-theme</code>: this dictates the colors and styles that are applied to foreground text by the syntax highlighter. Thus the concept of &quot;theme&quot; in delta encompasses not just the foreground syntax-highlighting color theme, but also background colors, decorations such as boxes and under/overlines, etc.</p>
 <p>The delta git repo contains a <a href="./themes.gitconfig">collection of themes</a> created by users. These focus on the visual appearance: colors etc. If you want features like <code>side-by-side</code> or <code>navigate</code>, you would set that yourself, after selecting the color theme. To use the delta themes, clone the delta repo (or download the <a href="./themes.gitconfig">themes.gitconfig</a> file) and add the following entry in your gitconfig:</p>
 <pre><code class="language-gitconfig">[include]
     path = /PATH/TO/delta/themes.gitconfig
@@ -479,7 +479,7 @@ We can also define custom named colors in git config, and styles can reference o
 <table><tr><td><img width=500px src="https://user-images.githubusercontent.com/52205/144783121-bb549100-69d8-41b8-ac62-1704f1f7b43e.png" alt="image" /></td></tr></table>
 <p>This display can be customized using <code>merge-conflict-begin-symbol</code>, <code>merge-conflict-end-symbol</code>, <code>merge-conflict-ours-diff-header-style</code>, <code>merge-conflict-ours-diff-header-decoration-style</code>, <code>merge-conflict-theirs-diff-header-style</code>, <code>merge-conflict-theirs-diff-header-decoration-style</code>.</p>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="git-blame"><a class="header" href="#git-blame">Git blame</a></h1>
-<p>Set delta as the pager for <code>blame</code> in the <code>[pager]</code> section of your gitconfig: see the <a href="git-blame.html#get-started">example gitconfig</a>.
+<p>Set delta as the pager for <code>blame</code> in the <code>[pager]</code> section of your gitconfig: see the <a href="./get-started.html">example gitconfig</a>.
 If <code>hyperlinks</code> is enabled in the <code>[delta]</code> section then each blame commit will link to the commit on GitHub/GitLab/Bitbucket/etc.</p>
 <table><tr><td><img width=600px src="https://user-images.githubusercontent.com/52205/141891376-1fdb87dc-1d9c-4ad6-9d72-eeb19a8aeb0b.png" alt="image" /></td></tr></table>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="24-bit-color-truecolor"><a class="header" href="#24-bit-color-truecolor">24 bit color (truecolor)</a></h1>
@@ -1168,6 +1168,25 @@ https://github.com/dandavison/delta/issues.
     line-numbers-plus-style = 28
 </code></pre>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="side-by-side-view-2"><a class="header" href="#side-by-side-view-2">Side-by-side view</a></h1>
+<p><a href="https://github.com/vuejs/vue/commit/7ec4627902020cccd7b3f4fbc63e1b0d6b9798cd">https://github.com/vuejs/vue/commit/7ec4627902020cccd7b3f4fbc63e1b0d6b9798cd</a></p>
+<pre><code class="language-gitconfig">[delta]
+    features = side-by-side line-numbers decorations
+    syntax-theme = Dracula
+    plus-style = syntax &quot;#003800&quot;
+    minus-style = syntax &quot;#3f0001&quot;
+
+[delta &quot;decorations&quot;]
+    commit-decoration-style = bold yellow box ul
+    file-style = bold yellow ul
+    file-decoration-style = none
+    hunk-header-decoration-style = cyan box ul
+
+[delta &quot;line-numbers&quot;]
+    line-numbers-left-style = cyan
+    line-numbers-right-style = cyan
+    line-numbers-minus-style = 124
+    line-numbers-plus-style = 28
+</code></pre>
 
                     </main>
 
diff --git a/searchindex.js b/searchindex.js
index 17c50df3..a8ac8249 100644
--- a/searchindex.js
+++ b/searchindex.js
@@ -1 +1 @@
-Object.assign(window.search, {"doc_urls":["introduction.html#a-syntax-highlighting-pager-for-git-diff-and-grep-output","get-started.html#get-started","features.html#features","installation.html#installation","configuration.html#configuration","configuration.html#git-config-file","how-delta-works.html#how-delta-works","usage.html#usage","choosing-colors-styles.html#choosing-colors-styles","line-numbers.html#line-numbers","side-by-side-view.html#side-by-side-view","grep.html#grep","features-named-groups-of-settings.html#features-named-groups-of-settings","custom-themes.html#custom-themes","diff-highlight-and-diff-so-fancy-emulation.html#diff-highlight-and-diff-so-fancy-emulation","color-moved-support.html#--color-moved-support","navigation-keybindings-for-large-diffs.html#navigation-keybindings-for-large-diffs","merge-conflicts.html#merge-conflicts","git-blame.html#git-blame","24-bit-color-truecolor.html#24-bit-color-truecolor","using-delta-with-gnu-screen.html#using-delta-with-gnu-screen","using-delta-on-windows.html#using-delta-on-windows","mouse-scrolling.html#mouse-scrolling","using-delta-with-magit.html#using-delta-with-magit","supported-languages-and-themes.html#supported-languages-and-themes","comparisons-with-other-tools.html#comparisons-with-other-tools","build-delta-from-source.html#build-delta-from-source","related-projects.html#related-projects","related-projects.html#used-by-delta","related-projects.html#using-delta","related-projects.html#similar-projects","full---help-output.html#full---help-output","delta-configs-used-in-screenshots.html#delta-configs-used-in-screenshots","delta-configs-used-in-screenshots.html#side-by-side-view","side-by-side-view-1.html#side-by-side-view"],"index":{"documentStore":{"docInfo":{"0":{"body":37,"breadcrumbs":8,"title":7},"1":{"body":20,"breadcrumbs":2,"title":1},"10":{"body":123,"breadcrumbs":7,"title":3},"11":{"body":101,"breadcrumbs":3,"title":1},"12":{"body":103,"breadcrumbs":9,"title":4},"13":{"body":118,"breadcrumbs":5,"title":2},"14":{"body":101,"breadcrumbs":11,"title":5},"15":{"body":238,"breadcrumbs":7,"title":3},"16":{"body":29,"breadcrumbs":9,"title":4},"17":{"body":56,"breadcrumbs":5,"title":2},"18":{"body":20,"breadcrumbs":5,"title":2},"19":{"body":127,"breadcrumbs":9,"title":4},"2":{"body":153,"breadcrumbs":2,"title":1},"20":{"body":89,"breadcrumbs":9,"title":4},"21":{"body":28,"breadcrumbs":7,"title":3},"22":{"body":45,"breadcrumbs":5,"title":2},"23":{"body":12,"breadcrumbs":7,"title":3},"24":{"body":82,"breadcrumbs":7,"title":3},"25":{"body":14,"breadcrumbs":4,"title":2},"26":{"body":12,"breadcrumbs":6,"title":3},"27":{"body":0,"breadcrumbs":4,"title":2},"28":{"body":7,"breadcrumbs":4,"title":2},"29":{"body":9,"breadcrumbs":4,"title":2},"3":{"body":160,"breadcrumbs":2,"title":1},"30":{"body":15,"breadcrumbs":4,"title":2},"31":{"body":3300,"breadcrumbs":6,"title":3},"32":{"body":0,"breadcrumbs":8,"title":4},"33":{"body":67,"breadcrumbs":7,"title":3},"34":{"body":0,"breadcrumbs":10,"title":3},"4":{"body":0,"breadcrumbs":2,"title":1},"5":{"body":172,"breadcrumbs":4,"title":3},"6":{"body":156,"breadcrumbs":4,"title":2},"7":{"body":0,"breadcrumbs":2,"title":1},"8":{"body":48,"breadcrumbs":7,"title":3},"9":{"body":25,"breadcrumbs":5,"title":2}},"docs":{"0":{"body":"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. delta with line-numbers activated delta with side-by-side and line-numbers activated","breadcrumbs":"Introduction » A syntax-highlighting pager for git, diff, and grep output","id":"0","title":"A syntax-highlighting pager for git, diff, and grep output"},"1":{"body":"Install delta and add this to your ~/.gitconfig: [core] pager = delta [interactive] diffFilter = delta --color-only [delta] navigate = true [merge] conflictstyle = diff3 [diff] colorMoved = default","breadcrumbs":"Get started » Get started","id":"1","title":"Get started"},"10":{"body":"[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 ] To disable the line numbers in side-by-side view, but keep a vertical delimiter line between the left and right panels, use the line-numbers format options. For example: [delta] side-by-side = true line-numbers-left-format = \"\" line-numbers-right-format = \"│ \" Long lines are wrapped if they do not fit in side-by-side mode. In the image below, the long deleted line in the left panel overflows by a small amount, and the wrapped content is right-aligned in the next line. In contrast, the long replacement line in the right panel overflows by almost an entire line, and so the wrapped content is left aligned in the next line. The arrow markers and ellipsis explain when and how text has been wrapped. For control over the details of line wrapping, see --wrap-max-lines, --wrap-left-symbol, --wrap-right-symbol, --wrap-right-percent, --wrap-right-prefix-symbol, --inline-hint-style. Line wrapping was implemented by @th1000s.","breadcrumbs":"Usage » Side-by-side view » Side-by-side view","id":"10","title":"Side-by-side view"},"11":{"body":"Delta applies syntax-highlighting and other enhancements to standard grep output such as from git grep, ripgrep (aka rg), grep, etc. To use with git grep, set delta as the pager for grep in the [pager] section of your gitconfig. See the example at the top of the page . Output from other grep tools can be piped to delta: e.g. rg -Hn --color=always, grep -Hn --color=always, etc. To customize the colors and syntax highlighting, see grep-match-line-style, grep-match-word-style, grep-contexct-line-style, grep-file-style, grep-line-number-style. Ripgrep's rg --json output format is supported; this avoids certain file name parsing ambiguities that are inevitable with the standard grep output formats. Note that git grep can display the \"function context\" for matches and that delta handles this output specially: see the -p and -W options of git grep.","breadcrumbs":"Usage » Grep » Grep","id":"11","title":"Grep"},"12":{"body":"All delta options can go under the [delta] section in your git config file. However, you can also use named \"features\" to keep things organized: these are sections in git config like [delta \"my-feature\"]. Here's an example using two custom features: [delta] features = unobtrusive-line-numbers decorations whitespace-error-style = 22 reverse [delta \"unobtrusive-line-numbers\"] line-numbers = true line-numbers-minus-style = \"#444444\" line-numbers-zero-style = \"#444444\" line-numbers-plus-style = \"#444444\" line-numbers-left-format = \"{nm:>4}┊\" line-numbers-right-format = \"{np:>4}│\" line-numbers-left-style = blue line-numbers-right-style = blue [delta \"decorations\"] commit-decoration-style = bold yellow box ul file-style = bold yellow ul file-decoration-style = none hunk-header-decoration-style = yellow box","breadcrumbs":"Usage » \"Features\": named groups of settings » \"Features\": named groups of settings","id":"12","title":"\"Features\": named groups of settings"},"13":{"body":"A \"theme\" in delta is just a collection of settings grouped together in a named feature . One of the available settings is syntax-theme: this dictates the colors and styles that are applied to foreground text by the syntax highlighter. Thus the concept of \"theme\" in delta encompasses not just the foreground syntax-highlighting color theme, but also background colors, decorations such as boxes and under/overlines, etc. The delta git repo contains a collection of themes created by users. These focus on the visual appearance: colors etc. If you want features like side-by-side or navigate, you would set that yourself, after selecting the color theme. To use the delta themes, clone the delta repo (or download the themes.gitconfig file) and add the following entry in your gitconfig: [include] path = /PATH/TO/delta/themes.gitconfig Then, add your chosen color theme to your features list, e.g. [delta] features = collared-trogon side-by-side = true ... Note that this terminology differs from bat : bat does not apply background colors, and uses the term \"theme\" to refer to what delta calls syntax-theme. Delta does not have a setting named \"theme\": a theme is a \"feature\", so one uses features to select a theme.","breadcrumbs":"Usage » Custom themes » Custom themes","id":"13","title":"Custom themes"},"14":{"body":"Use --diff-highlight or --diff-so-fancy to activate the respective emulation mode. You may want to know which delta configuration values the emulation mode has selected, so that you can adjust them. To do that, use e.g. delta --diff-so-fancy --show-config: diff-highlight is a perl script distributed with git that allows within-line edits to be identified and highlighted according to colors specified in git config. diff-so-fancy builds on diff-highlight, making various additional improvements to the default git diff output. Both tools provide very helpful ways of viewing diffs, and so delta provides emulation modes for both of them. The within-line highlighting rules employed by diff-highlight (and therefore by diff-so-fancy) are deliberately simpler than Delta's Levenshtein-type edit inference algorithm (see discussion in the diff-highlight README ). diff-highlight's rules could be added to delta as an alternative highlighting algorithm, but that hasn't been done yet.","breadcrumbs":"Usage » diff-highlight and diff-so-fancy emulation » diff-highlight and diff-so-fancy emulation","id":"14","title":"diff-highlight and diff-so-fancy emulation"},"15":{"body":"Recent versions of Git (≥ v2.17, April 2018) are able to detect moved blocks of code and style them differently from the usual removed/added lines. If you have activated this feature in Git, then Delta will automatically detect such differently-styled lines, and display them unchanged, i.e. with the raw colors it receives from Git. To activate the Git feature, use [diff] colorMoved = default and see the Git documentation for the other possible values and associated color configuration. The map-styles option allows us to transform the styles that git emits for color-moved sections into delta styles. Here's an example of using map-styles to assign delta styles to the raw color-moved styles output by git. This feature allows all of git's color-moved options to be rendered using delta styles, including with syntax highlighting. [delta] map-styles = bold purple => syntax magenta, bold cyan => syntax blue It is also possible to reference other styles. [delta] features = my-color-moved-theme [delta \"my-color-moved-theme\"] git-moved-from-style = bold purple # An ad-hoc named style (must end in \"-style\") map-styles = \"my-color-moved-theme.git-moved-from-style => red #cccccc, \\ bold cyan => syntax #cccccc\" # we could also have defined git-moved-to-style = bold cyan To make use of that, you need to know that git is emitting \"bold cyan\" and \"bold purple\". But that's not always obvious. To help with that, delta now has a --parse-ansi mode. E.g. git show --color=always | delta --parse-ansi outputs something like this: As you see above, we can now define named styles in gitconfig and refer to them in places where a style string is expected. We can also define custom named colors in git config, and styles can reference other styles; see the hoopoe theme for an example: [delta \"hoopoe\"] green = \"#d0ffd0\" # ad-hoc named color plus-style = syntax hoopoe.green # refer to named color plus-non-emph-style = plus-style # styles can reference other styles Additionally, we can now use the 140 color names that are standard in CSS. Use delta --show-colors to get a demo of the available colors, as background colors to see how they look with syntax highlighting:","breadcrumbs":"Usage » --color-moved support » --color-moved support","id":"15","title":"--color-moved support"},"16":{"body":"Use the navigate feature to activate navigation keybindings. In this mode, pressing n will jump forward to the next file in the diff, and N will jump backwards. If you are viewing multiple commits (e.g. via git log -p) then navigation will also visit commit boundaries.","breadcrumbs":"Usage » Navigation keybindings for large diffs » Navigation keybindings for large diffs","id":"16","title":"Navigation keybindings for large diffs"},"17":{"body":"Consider setting [merge] conflictstyle = diff3 With that setting, when a merge conflict is encountered, delta will display diffs between the ancestral commit and each of the two merge parents: This display can be customized using merge-conflict-begin-symbol, merge-conflict-end-symbol, merge-conflict-ours-diff-header-style, merge-conflict-ours-diff-header-decoration-style, merge-conflict-theirs-diff-header-style, merge-conflict-theirs-diff-header-decoration-style.","breadcrumbs":"Usage » Merge conflicts » Merge conflicts","id":"17","title":"Merge conflicts"},"18":{"body":"Set delta as the pager for blame in the [pager] section of your gitconfig: see the example gitconfig . If hyperlinks is enabled in the [delta] section then each blame commit will link to the commit on GitHub/GitLab/Bitbucket/etc.","breadcrumbs":"Usage » Git blame » Git blame","id":"18","title":"Git blame"},"19":{"body":"Delta looks best if your terminal application supports 24 bit colors. See https://github.com/termstandard/colors#readme. 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 , or one of the others listed here . If you do not see smooth color gradients, see the discussion at tmux#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. True color output in GNU Screen is currently only possible when using a development build, as support for it is not yet implemented in the (v4) release versions. A snapshot of the latest Git trunk can be obtained via https://git.savannah.gnu.org/cgit/screen.git/snapshot/screen-master.tar.gz - the required build steps are described in the src/INSTALL file. After installing the program, 24-bit color support can be activated by including truecolor on in either the system's or the user's screenrc file.","breadcrumbs":"Usage » 24 bit color (truecolor) » 24 bit color (truecolor)","id":"19","title":"24 bit color (truecolor)"},"2":{"body":"Language syntax highlighting with color themes Within-line highlights based on 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 GitHub/GitLab/Bitbucket etc) 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 GitHub/GitLab/Bitbucket 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. Git style strings (foreground color, background color, font attributes) are supported for >20 stylable elements 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 ✅ ❌ ❌ ❌ independently stylable elements ✅ ✅ ✅ ❌ line numbering ✅ ❌ ❌ ✅ side-by-side view ✅ ❌ ❌ ✅ In addition, delta handles traditional unified diff output.","breadcrumbs":"Features » Features","id":"2","title":"Features"},"20":{"body":"When working in Screen without true color output, it might be that colors supposed to be different look the same in XTerm compatible terminals. If that is the case, make sure the following settings are included in your screenrc file: term screen-256color\ntermcapinfo xterm 'Co#256:AB=\\E[48;5;%dm:AF=\\E[38;5;%dm' # ANSI (256-color) patterns - AB: background, AF: foreground\nattrcolor b \".I\" # use bright colors for bold text If despite having those settings you still only get a limited set of colors, your build of Screen might have been configured without the --enable-colors256 flag. If this is the case, you have two options : If available for your OS, get a different package of Screen. Otherwise Build your own binary : Download and extract a release tarball from https://ftp.gnu.org/gnu/screen/ cd into the newly extracted folder Follow the instructions in the INSTALL file, and when running the ./configure command apply the --enable-colors256 flag.","breadcrumbs":"Usage » Using Delta with GNU Screen » Using Delta with GNU Screen","id":"20","title":"Using Delta with GNU Screen"},"21":{"body":"Delta works on Windows. However, it is essential to use a recent version of less.exe: you can download one from https://github.com/jftuga/less-Windows/releases/latest. If you see incorrect colors and/or strange characters in Delta output, then it is probably because Delta is picking up an old version of less.exe on your system.","breadcrumbs":"Usage » Using Delta on Windows » Using Delta on Windows","id":"21","title":"Using Delta on Windows"},"22":{"body":"If mouse scrolling isn't working correctly, ensure that you have the most recent version of less. For Windows you can download from https://github.com/jftuga/less-Windows/releases/latest For Mac you can install brew install less; brew link less Alternatively try setting your DELTA_PAGER environment variable to (at least) less -R. See issue #58 . See also bat README / \"Using a different pager\" , since the DELTA_PAGER environment variable functions very similarly for delta.","breadcrumbs":"Usage » Mouse scrolling » Mouse scrolling","id":"22","title":"Mouse scrolling"},"23":{"body":"Delta can be used when displaying diffs in the Magit git client: see magit-delta . Here's a screenshot:","breadcrumbs":"Usage » Using Delta with Magit » Using Delta with Magit","id":"23","title":"Using Delta with Magit"},"24":{"body":"To list the supported languages and color themes, use delta --list-languages and delta --list-syntax-themes. To see a demo of the color themes, use delta --show-syntax-themes: To add your own custom color theme, or language, please follow the instructions in the Customization section of the bat documentation : Adding a custom language Adding a custom theme 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.","breadcrumbs":"Usage » Supported languages and themes » Supported languages and themes","id":"24","title":"Supported languages and themes"},"25":{"body":"(delta --light) delta vs. git delta vs. diff-so-fancy /diff-highlight delta vs. github","breadcrumbs":"Comparisons with other tools » Comparisons with other tools","id":"25","title":"Comparisons with other tools"},"26":{"body":"You'll need to install the rust tools . Then: $ cargo build --release and use the executable found at ./target/release/delta.","breadcrumbs":"Build delta from source » Build delta from source","id":"26","title":"Build delta from source"},"27":{"body":"","breadcrumbs":"Related projects » Related projects","id":"27","title":"Related projects"},"28":{"body":"alacritty/vte mitsuhiko/console ogham/rust-ansi-term sharkdp/bat trishume/syntect","breadcrumbs":"Related projects » Used by delta","id":"28","title":"Used by delta"},"29":{"body":"bigH/git-fuzzy dandavison/magit-delta jesseduffield/lazygit junegunn/fzf.vim ms-jpq/sad wfxr/forgit","breadcrumbs":"Related projects » Using delta","id":"29","title":"Using delta"},"3":{"body":"You can download an executable for your system: Linux (glibc) | Linux (musl) | MacOS | Windows | All Alternatively you can install delta using a package manager: see repology.org/git-delta . Note that