summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2020-12-23 11:01:05 +0000
committerGitHub <noreply@github.com>2020-12-23 11:01:05 +0000
commit192a331bae828a6498ed90566a242dddc134236c (patch)
tree6db4989ba86951794b0e477c59c787e92497499e
parent66f73d74f5699cc8d15ef1688b01273ed9b33b40 (diff)
0.4.5 release (#457)
* Bump version in links to executables * Bump version in private Homebrew formula * Update README for 0.4.5
-rw-r--r--HomeBrewFormula/git-delta.rb6
-rw-r--r--README.md22
2 files changed, 19 insertions, 9 deletions
diff --git a/HomeBrewFormula/git-delta.rb b/HomeBrewFormula/git-delta.rb
index 9c59fc4f..2c791c52 100644
--- a/HomeBrewFormula/git-delta.rb
+++ b/HomeBrewFormula/git-delta.rb
@@ -1,5 +1,5 @@
class GitDelta < Formula
- version "0.4.4"
+ version "0.4.5"
desc "A viewer for git and diff output"
homepage "https://github.com/dandavison/delta"
@@ -7,10 +7,10 @@ class GitDelta < Formula
if OS.mac?
url "https://github.com/dandavison/delta/releases/download/#{version}/delta-#{version}-x86_64-apple-darwin.tar.gz"
- sha256 "da1190e462dad40f543ebf116b0d175ee3396674a10e375b2c17184c953de643"
+ sha256 "297fb1d52aa52b87035184b74ff04a3201117abd35e2d02e81d46a754f99f0a8"
elsif OS.linux?
url "https://github.com/dandavison/delta/releases/download/#{version}/delta-#{version}-x86_64-unknown-linux-musl.tar.gz"
- sha256 "e216dc40a041937783496a661d4a96077c765b030a0c144d54194356297d93a3"
+ sha256 "8207e65fa8e3277038ac7540ad1437103c0e9081ff266352b9e39aeef2bfc662"
end
conflicts_with "delta"
diff --git a/README.md b/README.md
index 0cf5ac01..9776b346 100644
--- a/README.md
+++ b/README.md
@@ -197,7 +197,7 @@ In addition, delta handles traditional unified diff output.
## Installation
-You can download an executable for your system: [Linux](https://github.com/dandavison/delta/releases/download/0.4.4/delta-0.4.4-x86_64-unknown-linux-gnu.tar.gz) | [MacOS](https://github.com/dandavison/delta/releases/download/0.4.4/delta-0.4.4-x86_64-apple-darwin.tar.gz) | [Windows](https://github.com/dandavison/delta/releases/download/0.4.4/delta-0.4.4-x86_64-pc-windows-msvc.zip) | [All](https://github.com/dandavison/delta/releases)
+You can download an executable for your system: [Linux](https://github.com/dandavison/delta/releases/download/0.4.5/delta-0.4.5-x86_64-unknown-linux-gnu.tar.gz) | [MacOS](https://github.com/dandavison/delta/releases/download/0.4.5/delta-0.4.5-x86_64-apple-darwin.tar.gz) | [Windows](https://github.com/dandavison/delta/releases/download/0.4.5/delta-0.4.5-x86_64-pc-windows-msvc.zip) | [All](https://github.com/dandavison/delta/releases)
Alternatively, delta is available in the following package managers:
@@ -596,7 +596,7 @@ and use the executable found at `./target/release/delta`.
## Full --help output
```
-delta 0.4.5 (dev)
+delta 0.4.5
A viewer for git and diff output
USAGE:
@@ -647,7 +647,7 @@ FLAGS:
OPTIONS:
--features <features>
Name of delta features to use (space-separated). A feature is a named collection of delta options in
- ~/.gitconfig. See FEATURES section [default: ]
+ ~/.gitconfig. See FEATURES section [env: DELTA_FEATURES=] [default: ]
--syntax-theme <syntax-theme>
The code syntax-highlighting theme to use. Use --show-syntax-themes to demo available themes. If the syntax-
highlighting theme is not set using this option, it will be taken from the BAT_THEME environment
@@ -694,8 +694,9 @@ OPTIONS:
application to handle the custom "file-line" URL scheme by opening the file in your editor/IDE at the
indicated line number. See https://github.com/dandavison/open-in-editor for an example [default: file://{path}]
--hunk-header-style <hunk-header-style>
- Style (foreground, background, attributes) for the hunk-header. See STYLES section. The style 'omit' can be
- used to remove the hunk header section from the output [default: syntax]
+ Style (foreground, background, attributes) for the hunk-header. See STYLES section. The special attribute
+ 'file' can be used to include the file path in the hunk header. The style 'omit' can be used to remove the
+ hunk header section from the output [default: syntax]
--hunk-header-decoration-style <hunk-header-decoration-style>
Style (foreground, background, attributes) for the hunk-header decoration. See STYLES section. The style
string should contain one of the special attributes 'box', 'ul' (underline), 'ol' (overline), or the
@@ -739,6 +740,9 @@ OPTIONS:
--file-added-label <file-added-label>
Text to display in front of a added file path [default: added:]
+ --file-copied-label <file-copied-label>
+ Text to display in front of a copied file path [default: copied:]
+
--file-renamed-label <file-renamed-label>
Text to display in front of a renamed file path [default: renamed:]
@@ -774,6 +778,12 @@ OPTIONS:
--whitespace-error-style <whitespace-error-style>
Style for whitespace errors. Defaults to color.diff.whitespace if that is set in git config, or else
'magenta reverse' [default: auto auto]
+ --line-buffer-size <line-buffer-size>
+ Size of internal line buffer. Delta compares the added and removed versions of nearby lines in order to
+ detect and highlight changes at the level of individual words/tokens. Therefore, nearby lines must be
+ buffered internally before they are painted and emitted. Increasing this value might improve highlighting of
+ some large diff hunks. However, setting this to a high value will adversely affect delta's performance when
+ entire files are added/removed [default: 32]
--minus-color <deprecated-minus-background-color>
Deprecated: use --minus-style='normal my_background_color'
@@ -815,7 +825,7 @@ given in a git config file, using the usual option names but without the initial
is
[delta]
- number = true
+ line-numbers = true
zero-style = dim syntax
FEATURES