summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2025-08-03Styled zero lines fixmainThomas Otto
With `interactive.diffFilter = delta --color-only` delta is called by e.g. `git add -p`, but in this mode git hides the terminal from the pager. Plus/minus lines correctly use ANSI sequences to paint up to to the end of the line, but zero lines always use spaces. This needs the terminal width, but it is not available for diffFilter. So the fallback of 80 is used, and zero styles did not extend to the full terminal width. Since zero lines are only rarely styled (e.g. via `--zero-style='syntax "#1d1f21" dim'`), this was never noticed. This also crashed delta when a zero line was longer than 80.
2025-08-03Normalize `merge.conflictStyle` casingJustin Su
2025-08-03fix: bump onig && onig_sys pinned versionstquin
2025-08-01Fix diff output when a diff ends with a mode changeThomas Otto
Output can be generated directly via Painter::write, or Painter::output_buffer. The latter must be emit()'ed before the former method can be used again, otherwise the order is incorrect. Tests added. Fixes #1504
2025-07-15Fix clippy errors (#2016)Justin Su
2025-07-05Tune themes weeping-willow, mirthful-willow (#2011)Laurens Vanderhoven
2025-05-02Fix index out of bounds crash for '@@ @@' hunk headerAdam Johnson
2025-02-21Bump more github actions versionsDan Davison
2025-02-21Bump upload-artifact action versionDan Davison
2025-02-21Document alternative config file location and include techniqueDan Davison
2025-02-05Update terminal-colorsaurus version to 0.4.8 (#1936)Rashil Gandhi
2025-02-05Upgrade unicode-width to v0.1.14 (but still < 0.2.0)Thomas Otto
2025-01-14Suggest minimum bat version in manual (#1941)Kevin Ernst
- make explicit mention of which bat version should be installed in the "Installation" and "Supported languages and themes" sections of the manual - add missing "Tips & tricks" page See https://github.com/dandavison/delta/issues/1712 for context.
2025-01-12chore(deps): update git2 to 0.20.0Rui Chen
Signed-off-by: Rui Chen <rui@chenrui.dev>
2025-01-09clippy 1.84 fixThomas Otto
2024-12-10hyperlink commit hashes of length 7 as wellThomas Otto
2024-12-02Don't keep subcommand stdout aroundThomas Otto
take() and pass it to BufReader so it gets closed when the reader stops. Otherwise on an early pager (EPIPE), and thus delta() exit the feeding subcommand still has an open stdout to write something into and wait()-ing on it hangs.
2024-11-28Support external subcommands: rg, diff, git-show (etc.) (#1769)Thomas Otto
* Support external subcommands: rg, git show, git log (etc.) The possible command line now is: delta <delta-args> [SUBCMD <subcmd-args>] If the entire command line fails to parse because SUBCMD is unknown, then try (until the next arg fails) parsing <delta-args> only, and then parse and call SUBCMD.., its output is piped into delta. Other subcommands also take precedence over the diff/git-diff mode (`delta a b`, where e.g. a=git and b=show), and any diff call gets converted into an external subcommand first. Available are: delta rg .. => rg --json .. | delta delta a b .. => git diff a b .. | delta delta git show .. => git <color-on> show .. | delta and all other git-CMDS, of which add -p, blame, checkout -p, diff, grep, log -p, reflog -p, and stash show -p produce a diff. Because --json is automatically added for `delta rg ..`, it avoids the parsing ambiguities of and is easier to type than `rg .. | delta`. The piping is not done by the shell, but delta, so the subcommands are now child processes of delta. * Set calling process directly because delta started it This info then takes precedence over whatever start_determining_calling_process_in_thread() finds or rather doesn't find. (The simple yet generous SeqCst is used on purpose for the atomic operations.)
2024-11-29clippy 1.83: silence zombie_processes false positiveThomas Otto
But now < 1.83 clippy would complain about an unknown lint, so allow that, too.
2024-11-29clippy 1.83: fix unnecessary_first_then_checkThomas Otto
2024-11-29clippy 1.83: apply explicit lifetimes elisions suggestionsThomas Otto
2024-11-20Allow multiple hyperlinks per lineThomas Otto
Previously only the last commit was linked. Do not link numbers (technically also commits), and stop after finding 12 commits on a line.
2024-11-20testability: add pretty_assertions, git mocksThomas Otto
2024-11-16Support {host} in hyperlinks (#1901)Dan Davison
* Support {host} in hyperlinks * Improve help text
2024-11-15Delete now-unused pricate homebrew formula step from Makefile (III) (#1830)dvermd
Signed-off-by: dvermd <315743+dvermd@users.noreply.github.com>
2024-11-15Rename poorly-named variables (#1904)Dan Davison
2024-11-14Honor pager path when checking less version (#1903)Dan Davison
2024-11-12De-emphasize auto-detection of colors in README configDan Davison
2024-11-11Suggest `delta -h` and `delta --help` in READMEDan Davison
2024-11-11Add console commands for git configuration (#1896)hrm
2024-11-09Redundant Option Checks, Unwrap Safety (#1892)shray sharma
Redundant Option Checks, unwrap Safety, unnecessary Lifetimes, Rust often infers lifetimes automatically --------- Co-authored-by: Quied <dexflame3@gmail.com>
2024-11-09Center-align README content (#1893)Dan Davison
* Center-align README content As suggested by godelski https://news.ycombinator.com/item?id=42092463
2024-11-05Add optional capture-output writer to run_app()Thomas Otto
The output and exit code of run_app() are now testable, used for diff test.
2024-11-04CI: switch to macos-13, as 12 will be unsupported soonThomas Otto
2024-10-31Add themes weeping-willow, mirthful-willow (#1864)Laurens Vanderhoven
2024-10-29Recommend zdiff3 merge.conflictStyle (#1260)Adam Johnson
2024-10-22Don't set colorMoved in introductory instructions (#1884)Dan Davison
Fixes #1098
2024-10-21Refactor (#1877)Dan Davison
2024-10-14Use same example config in manual as README (#1879)Dan Davison
Fixes #1878
2024-09-27Evolve toggling section of manualDan Davison
2024-09-22Improve blame file type detection (#1829)dvermd
Move blame to CallingProcess Signed-off-by: dvermd <315743+dvermd@users.noreply.github.com>
2024-09-15Do not double panic in FakeParentArgs::dropdvermd
Signed-off-by: dvermd <315743+dvermd@users.noreply.github.com>
2024-09-11Update release MakefileDan Davison
2024-09-11Link to new binariesDan Davison
2024-09-11Bump versionDan Davison
2024-09-11Upgrade and pin unicode-width to v0.1.12Thomas Otto
v0.1.13 calculates the width of some characters differently, which causes delta to panic See unicode-rs/unicode-width#55 and unicode-rs/unicode-width#66
2024-09-08Consolidate doc commentsTau Gärtli
2024-09-08Remove fallback to bat theme env varTau Gärtli
The fallback is already handled in `set_options`
2024-09-08Replace "light mode" bool with a dedicated enumTau Gärtli
2024-09-08Make docs proper module-level docsTau Gärtli