Up to [cvs.NetBSD.org] / pkgsrc / textproc / git-delta
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
git-delta: update to 0.20.1. 0.20.1 Patch release fixing #2270 0.20.0 This release adds support for the OSC1717 diff-line metadata spec by @stefanhaller. This is an exciting change: it allows TUIs such as lazygit to use delta to render diffs in a UI with keybindings for staging/unstaging etc, with the delta rendering able to use arbitrary features such as side-by-side mode and decorations.
textproc/git-delta: update to 0.19.2 This is a patch release providing rebuilt binaries compatible with Debian 12 (the 0.19.0 and 0.19.1 .deb packages required glibc 2.39, which is only available in Debian 13). What's Changed - CD: pin GNU Linux builds to ubuntu-22.04 for Debian 12 compat by @dandavison in #2135
git-delta: update to 0.19.1. Leaf package. 0.19.1 Fix CD: replace defunct ubuntu-20.04 runners by @dandavison in #2129 0.19.0 Tons of improvements; thanks very much to all delta contributors.
textproc/git-delta: update to 0.18.2 This patch release fixes various panics reported by users that were due to v0.1.13 of the unicode-width crate. See #1858 and unicode-rs/unicode-width#66. What's Changed - Move AmbiguousDiffMinusCounter to hunk_header by @dandavison in #1825 - Fix Catppuccin Latte name in LIGHT_SYNTAX_THEMES list by @injust in #1823 - Handle quoted file paths in hunk headers by @th1000s in #1840 - Fix clippy warnings by @bash in #1851 - Allow --dark to override dark/light detected from syntax theme by @bash in #1843 - Upgrade and pin unicode-width to v0.1.12 by @th1000s in #1858
textproc/git-delta: update to 0.18.1 This patch release fixes an issue with delta --version that was causing problems downstream (#1818). What's Changed - Add hyperlinks section to manual by @dandavison in #1816 - Added platypus theme by @sarpuser in #1819 - Don't use pager for --version by @dandavison in #1824
textproc/git-delta: update to 0.18.0
As usual, tons of excellent contributions, all but one not by me! @th1000s has made a huge number of important and difficult improvements to delta and helped with many issues over the few years since the project started, and so I'm happy to say that he's co-maintaining the project with me nowadays. Thanks to all contributors for the improvements below!
What's Changed
Link to Repository from Manual by @bash in #1657
Stop highlighting unchanged whitespace by @phillipwood in #1659
Add .gitattributes rules for rust files by @phillipwood in #1245
Repair --default-language, and highlight using full filename by @th1000s in #1549
tests: prevent parallel env var access by @th1000s in #1681
CI: fix macOS build by @th1000s in #1696
Only use nosort in bash <4.4 by @martinml in #1683
Don't read git files when --no-gitconfig is given + unused variables by @th1000s in #1728
tests: add insta for snapshot testing by @th1000s in #1739
tests: set terminal width to 43 by @th1000s in #1741
Fix panic when blame-palette is empty by @thorio in #1737
Make relative-paths work with binary files by @th1000s in #1740
Fix github links from master to main by @madeddie in #1709
Update terminal-colorsaurus by @bash in #1699
Make less version >= 633 behave like previous versions wrt. Nerd Fonts by @th1000s in #1762
Update catppuccin-latte casing in LIGHT_SYNTAX_THEMES list by @injust in #1745
deps: bump libc from 0.2.153 to 0.2.155 by @wxpppp in #1715
Add missing --file-*-label option to --navigate docs by @injust in #1744
Fix copy-paste typo by @injust in #1767
Update syntect to 5.2.0 by @timhillgit in #1672
Disable light mode detection in tests by @bash in #1765
Add --max-syntax-highlighting-length, set to 400 by @th1000s in #1746
chore: cleanup brew formula file in favor of core tap by @chenrui333 in #1773
wrap --help output, fix rust 1.80 build by @th1000s in #1440
Fix delta-toggle shell script by @dandavison in #1794
Do not wrap short help (-h) output by @th1000s in #1800
Implement --diff-args by @dandavison in #1697
Handle ambiguous diff header, '--- ' can also be present in a minus hunk by @th1000s in #1787
cd: build binaries targeting GNU libc on ubuntu-20.04, not latest by @th1000s in #1805
textproc/git-delta: Switch to libgit2-sys crate
textproc/git-delta: update to 0.17.0
Thanks to the many contributors! Particular highlights are
Thanks to @bash's work, delta now automatically detects whether your terminal
has a light/dark background (unless you specify with --light or --dark):
Detect Dark/Light Mode from Terminal by @bash in #1615
@joshtriplett solved the long-standing problem of correctly parsing traditional
grep output, e.g. git grep, grep, etc. Until now there had been annoying parse
ambiguities related to separator characters in file paths. This is particularly
valuable for git grep since it has interesting features such as git grep -W
(see #769)
Parse filename unambiguously using color escape sequences by @joshtriplett in #1634
@imbrish fixed two important bugs and added the ability to set a default
language (e.g. for executable shell scripts with no file name suffix)
Honor default-language option by @imbrish in #1655
Preserve "Binary files" line in color_only mode by @imbrish in #1649
Fix headers of modified binary files by @imbrish in #1629
What's Changed
Add mellow-barbet theme by @kvrohit in #1452
Fix alignment in blame mode when author name contains unicode accent modifiers by @hpwxf in #1456
Replace usage of the atty crate with std::io::IsTerminal trait by @nickelc in #1465
Refactor subcommand handling by @dandavison in #1467
Bump clap to v4.3.14 and regenerate Cargo.lock by @th1000s in #1472
Fix issue where pager would be set to more or most by @ippsav in #1494
Improve binary file added output by @Sondeyy in #1502
Remove the navigation setting from themes. by @Qwerty-133 in #1503
Add assertion failure message by @dandavison in #1508
Fix handling of tabs in grep output by @dandavison in #1507
Support users other than git in github SSH URLs by @dandavison in #1509
Update installation instructions for openSUSE by @sorairolake in #1550
feat: generate completion subcommand by @plustik in #1561
Make hunk header code fragment display optional by @zmc in #1568
Adding new theme in themes.gitconfig by @pablospe in #1544
feat(theme): add arctic-fox custom theme by @anthony-halim in #1539
--show-themes exit with error when no themes by @dandavison in #1611
Bug fix: reset syntax highlighter across grep sections by @dandavison in #1613
Switch from vte to anstyle-parse (already used in dependencies) by @joshtriplett in #1638
Parse filename unambiguously using color escape sequences by @joshtriplett in #1634
Fix headers of modified binary files by @imbrish in #1629
Upgrade bytelines to latest, without default features by @whitfin in #1597
Add Catppuccin latte to light syntax themes by @dvic in #1573
Update Arch Linux package URL in installation.md by @felixonmars in #1569
Change Winget Releaser job to ubuntu-latest by @sitiom in #1512
use wildcard in suggested true color fix for tmux by @jcaplan in #1560
Update git2 by @dandavison in #1647
Add corvus theme by @evilwaveforms in #1652
Preserve "Binary files" line in color_only mode by @imbrish in #1649
Detect Dark/Light Mode from Terminal by @bash in #1615
Honor default-language option by @imbrish in #1655
git-delta: install themes config file Bump PKGREVISION.
textproc/git-delta: fix build with new libgit2
textproc/git-delta: update to 0.16.5 0.16.5 This is a follow-up release providing the various binaries that were no released with 0.16.4. It also makes some adjustments to delta's (rip)grep support. What's Changed - Increase number of characters shown in submodule hashes by @dandavison in #1421 - Fix typo in publishing build job & restore cross-compilation by @nickelc in #1430 - 3819e94 Drop grep-header-style option by @dandavison - a28231a Honor grep-header-decoration-style for ripgrep output by @dandavison 0.16.4 It's 6 months since the last release so this one brings quite a few changes. Thanks very much to all contributors, especially @nickelc for a huge number of contributions, and @wescande for his work on improving whitespace highlighting. With this release delta can now display grep output in (hopefully) exactly the same layout that ripgrep does, but adding syntax highlighting, hyperlinks, and navigation. Use ripgrep --json ... | delta for that, or set grep-output-type = ripgrep to get that output style from git grep etc. This release does not contain binaries for x86_64-unknown-linux-musl, i686-unknown-linux-gnu, arm-unknown-linux-gnueabihf, or aarch64-unknown-linux-gnu because the cross-compilation GitHub Actions jobs were broken at the time of release. I'll issue a follow-up release including them when that's fixed. What's Changed - Address deprecated clap features by @tjquillan in #1251 - Fix clippy warnings by @nickelc in #1298 - Replace unmaintained/outdated GitHub Actions by @nickelc in #1317 - Reduce allocations during --show-colors by @nickelc in #1315 - Fix the--show-themes command by @nickelc in #1320 - Fixed broken link to README by @zonuexe in #1185 - Update git2 to 0.16.1 by @nickelc in #1323 - Fix warning from bat for an unknown syntax theme by @nickelc in #1319 - Add gruvmax-fang theme by @MaxFangX in #1291 - Spelling by @jsoref in #1257 - Update clap to 4.1 by @nickelc in #1322 - Encapsulate git2 types by @nickelc in #1326 - Update dependencies & switch back to the dirs crate by @nickelc in #1325 - Return the GitRemoteRepo type directly by @nickelc in #1328 - Added config option. by @ShogunPanda in #1324 - Add Winget Releaser workflow by @sitiom in #1331 - Get git's minus/plus style from config instead of copying it around by @nickelc in #1329 - Add methods for getting GitConfig as reference by @nickelc in #1336 - Rename git_config_entry module to remote by @nickelc in #1337 - Tips and tricks manual section by @dandavison in #1339 - Set language specifiers for code blocks and fix links in manual by @nickelc in #1340 - Derive the default for enums with #[derive(Default)]/#[default] by @nickelc in #1341 - Add discord-dark theme by @ILikePlayingGames in #1334 - Merge the different GitConfig constructors for a config file by @nickelc in #1342 - Remove manual line-wrapping by @dandavison in #1350 - Add link to similar project walles/riff by @walles in #1362 - add: installation instructions for conda/mamba by @YYYasin19 in #1371 - Clarify how to use delta with tmux by @isak102 in #1402 - Update bitflags to 2.2 by @nickelc in #1361 - Fix some typos by @goggle in #1379 - Remove unneeded extern crate statements by @nickelc in #1345 - Downgrade and pin the bytelines crate by @nickelc in #1378 - Improve manual build job by @nickelc in #1404 - Replace deprecated error_chain crate with anyhow by @nickelc in #1405 - Fix submodule diff parsing by @th1000s in #1413 - Fix warning highlight for trailing whitespace by @wescande in #1037 - Misc tab refactoring by @th1000s in #1424 - manual: fix link to using delta on Windows by @mataha in #1428 - Introduce grep-output-type option: ripgrep or classic by @dandavison in #1410
git-delta: use cargo.mk's install
textproc/git-delta: update to 0.15.1 - Explicitly request xz compression by @dandavison in #1249
textproc/git-delta: update to 0.15.0 What's Changed Thanks to all contributors for the changes in this release! One particularly exciting contribution is the tweaks to the highlighting algorithm made by @phillipwood in #1244. This is something that has remained more or less the same since delta was first created, but #1244 brings several improvements in the details of exactly which characters are highlighted. - Change Rust toolchain in 'Deploy Manual' CI task by @dandavison in #1183 - Switch bat to library mode by @tranzystorek-io in #1187 - Add sourcehut link parsing by @p00f in #1190 - Refactoring ansi/iterator by @zhiburt in #1191 - Add codeberg link parsing by @p00f in #1194 - Add terminal width fallback via stty if on windows/MSYS2 by @th1000s in #1030 - measure_text_width() without constructing a temporary string by @th1000s in #1216 - Remove Git 2.37 workaround from install docs by @adamchainz in #1228 - Fix clippy warnings by @clnoll in #1236 - Remove Provides in Debian package by @baryluk in #1217 - Handle quoted filenames in diff header by @th1000s in #1222 - ci: improve formatting by @MarcoIeni in #1238 - Highlighting improvements by @phillipwood in #1244 - ci: release apple arm binary by @MarcoIeni in #1239 - try fix bad alignment in unicode (#1144) by @SheldonNico in #1145
textproc/git-delta: update to 0.14.0 What's Changed - Update color-moved-support.md by @hangtwenty in #1082 - Tweak some words improved representation by @ydah in #1078 - Only trigger git show handler if a file extension was parsed by @dandavison in #1106 - Fix commit hyperlink formatting by @dandavison in #1110 - Avoid lockup when running without arguments and stdin is connected to a tty by @dotdash in #1112 - Fix whole-file changes being attributed to the wrong commit in "git log" output by @dotdash in #1111 - Update README.md to include git 2.37.0 workaround by @cwlbraa in #1116 - Don't attempt to process ANSI sequences in non-UTF8 input by @dandavison in #1117 - Update clap by @dandavison in #1119 - Recreate highlighter on each line of git show $commit:$path output by @dandavison in #1127 - Fix git-grep match-highlighting at line-start by @jdpopkin in #1057 - Update to chameleon theme by @AirOnSkin in #1138 - Fix typos by @kianmeng in #1151 - Support configurable timestamps in git blame output (#1157) by @mliszcz in #1158 - Added auto completions for fish shell by @exploide in #1165
textproc/git-delta: update to 0.13.0
What's Changed
-Update bat dependency so that delta is compatible with latest bat release
(#1075)
-Flush line buffers in additional locations by @dandavison in #1003
-Reorganize wrapping utilities by @dandavison in #1008
-Bump regex to fix CVE-2022-24713 by @msirringhaus in #1015
-Apply file-transformation to diff header in addition to hunk header
by @dandavison in #1012
-Add support for irreversible-delete by @wescande in #945
-Add custom env struct to store env at init by @wescande in #1025
-Apply hyperlinks to diff stat file paths by @dandavison in #1035
-Add link to bat on README by @eloyesp in #1052
-Add chameleon theme to themes.gitconfig by @AirOnSkin in #1062
-Add 'light = false' w/ comment in gitconfig by @toolness in #1073
git-delta: update to 0.12.1.
What's Changed
Make git include colors in output going to delta by @dandavison in #966
Clarify language: "in front of" → "before" by @waldyrious in #967
Fix parsing for .properties files with - in path by @jdpopkin in #975
Support CSI sequences other than SGR by @yoichi in #976
Enable commit links for GitLab by @jwarlander in #972
Fall back to plain diff when process substitution is used by @th1000s in #978
Include information about GIT_PAGER in manual by @katylava in #991
Use assets API from bat library instead of vendored code by @dandavison in #903
Calling process: Query more parents, disable full scan by @th1000s in #984
Run in diff mode iff two positional arguments are supplied by @dandavison in #995
git-delta: update to 0.12.0.
There's quite a lot in this release, with contributions from 8 different
people.
Firstly a breaking change: some deprecated options are no longer supported:
in particular plus-color and minus-color. See #914. A description of this
change and what you need to do if you're affected by it is below.
Secondly, improvements, including:
- A (much-needed) short help text is now available: use delta -h. Delta is
the proud possessor of 100 command-line options, so I think this is going
to be helpful.
- git blame output now displays line numbers (thanks to @th1000s)
- Improvements to file and mode labels by @WayneD
- delta now has a user manual: https://dandavison.github.io/delta/. You can
even create a PDF copy (print button in upper-right hand corner), and the
README is correspondingly now a much easier read with the minimal required
setup instructions and an overview of functionality with screenshots.
Finally some bug fixes, including
- File path hyperlinks (e.g. in diff and grep output) were previously
sometimes incorrect, especially when delta was invoked from a directory
other than the repo root.
- Some fixes to grep output parsing edge cases
Deprecated options no longer supported:
The options affected here have been deprecated for a couple of years; I hope
this doesn't cause you any trouble. Here are the details:
The most common case is that you have something like this in your ~/.gitconfig:
[delta]
plus-color = my_plus_color minus-color = my_minus_color
Please change that to
[delta]
plus-style = syntax my_plus_color minus-style = normal my_minus_color
Here's the list of deprecated options with a summary of how to update them:
minus-color Deprecated: use `minus-style = normal my_background_color`
plus-color Deprecated: Use `plus-style = syntax my_background_color`
minus-emph-color Deprecated: use `minus-emph-style = normal my_background_color`
plus-emph-color Deprecated: Use `plus-emph-style = syntax my_background_color`
highlight-removed Deprecated: use `minus-style = syntax my_background_color`
commit-color Deprecated: use `commit-style = my_foreground_color
commit-decoration-style = my_foreground_color`
file-color Deprecated: use `file-style = my_foreground_color
file-decoration-style = my_foreground_color`
hunk-style Deprecated: synonym of `hunk-header-decoration-style`
hunk-color Deprecated: use `hunk-header-style = my_foreground_color
hunk-header-decoration-style = my_foreground_color`
theme Deprecated: use `syntax-theme`
textproc/git-delta: update to 0.11.3
0.9.0
=====
With this release, long lines are wrapped in side-by-side mode, thanks to a
far-reaching series of contributions by @th1000s (see #515). No special
customization is needed, but sophisticated control over the details is
available: see --wrap-max-lines, --wrap-left-symbol, --wrap-right-symbol,
--wrap-right-percent, --wrap-right-prefix-symbol, --inline-hint-style.
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.
What's Changed
-Fix the empty result issue in add -p by @norisio in #664
-Recognize GitHub SSH remote URLs that don't start with git@ for hyperlinks by
@spaarmann in #668
-Terminate process gracefully on error in diff() by @dandavison in #685
-Ignore ctrl-c (SIGINT) to avoid leaving an orphaned pager process. by
@dandavison in #686
-Remove unnecessary borrows by @benarmstead in #692
-Fix computed values to be computed after all set_options by @ulwlu in #690
-Make it possible to jump between files when navigate is active by @dandavison
in #684
-Fix empty line highlighting by @th1000s in #642
-Fix deadlock in git diff mode by @dandavison in #695
-Support insteadOf replacements in git remote URLs by @dandavison in #694
-Do not suppress submodule diffs by @dandavison in #699
-More minimalistic display of submodule (short) diffs by @dandavison in #700
-Fix hunk header when line number is not requested and navigate is enabled by
@dandavison in #710
-Display removed file name in file deletion case by @dandavison in #717
-Remove superfluous lowercasing of feature names by @Tak in #718
-Option to set the background extension mode to ANSI or spaces by @th1000s
in #512
-Add side-by-side line wrapping mode by @th1000s in #515
-Width can be an offset from the terminal width by @th1000s in #727
-Linenumber refactoring by @th1000s in #740
-Use fatal() to exit with errorcode 2 by @th1000s in #739
-Re-enable ANSI fill by equalizing panel sizes by @th1000s in #742
-Update syntaxes and themes from bat v0.18.3 by @FnControlOption in #702
-Line numbers and side-by-side mode by @th1000s in #748
0.9.1
=====
This is a followup to release 0.9.0 fixing a bug in the --help text emitted by
the 0.9.0 binary (see 3aab5d1).
0.9.0 was a major release adding line-wrapping to side-by-side mode: 0.9.0
release notes.
0.9.2
=====
This release fixes a regression introduced in 0.9.0 affecting the use of
git add -p when submodules are present. See #755
What's Changed
-Do not reformat submodule diffs under git add -p by @dandavison in #756
0.10.0
======
New features in this release:
-delta displays output from git grep and rg --json ... | delta with code syntax
highlighting and navigate functionality. See README#grep and #774.
-delta displays output from git blame with code syntax highlighting, hyperlinks
to commits, and control over formatting. See README#git-blame and #761.
-delta syntax highlights file contents produced by git show $revision
/path/to/file
-delta can apply syntax highlighting and arbitrary styling to the raw colors
emitted by git --color-moved. This is done by specifying rules for remapping
styles using map-styles. See below, and README#--color-moved-support and #72
-More powerful configuration options: styles can reference other styles, custom
styles and custom colors can be defined in gitconfig and reused, and 140 colors
can be specified using their standard CSS names. See below.
-New subcommand --show-colors outputs a demo of 140 background colors with
syntax highlighting, to help choose background colors.
-New subcommand --parse-ansi takes color input and prints out the corresponding
style strings (useful for map-styles)
-Utilities for interrogating the command line of the process that is sending
output to delta, added by @th1000s.
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.
0.10.1
======
This release fixes a bug in color-moved handling when files have DOS line
endings. See #800
What's Changed
-Remove trailing \r from raw line, in presence of ANSI escape sequences by
@dandavison in #800
0.10.2
======
This releases fixes a bug when using side-by-side with git diff.colorMoved.
See #802
What's Changed
-802 fix color moved side by side panic by @dandavison in #803
0.10.3
======
Delta was previously handling --word-diff and --color-words output in a
nonsensical way. With this release, delta does not attempt to handle these
output types, allowing git's raw output through unchanged. Appropriate handling
may be added later. See #152
When a line is unchanged but paired with a line that has additions/deletions,
delta now assigns the unchanged line {plus,minus}-non-emph-style; previously it
assigned {plus,minus}-style. This change does not alter visual output by default
because by default those two style styles are set to the same value. See #785
Fixes a bug affecting line numbers in side-by-side mode, see #819
0.11.0
======
This release adds handling of merge conflicts and the "combined" diff format
which git uses for merge commits; see the Merge conflicts README section and
#189. Please 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.
0.11.1
======
Fixes a crash that can occur, see for example #826. Thanks @mrjoel.
What's Changed
-Be permissive about unexpected state machine state by @dandavison in #827
0.11.2
======
This release fixes a performance problem that was affecting some users. See #824
0.11.3
======
Fix handling of --word-diff and --color-words (#829). Note that line-numbers and
side-by-side will be ignored if delta detects that the input was generated by
git --word-diff / --color-words.
DELTA_FEATURES can now be used to add to features specified in ~/.gitconfig.
Use a + prefix to do this: an example is DELTA_FEATURES=+side-by-side which will
activate side-by-side, in addition to your usual features.
Store less history file in a better location on Windows. Thanks @rashil2000 for
this work!
Fix performance issue affecting some linux users (#839)
What's Changed
-Bump sysinfo from 0.19.2 to 0.20.5 by @dependabot in #811
-#833 refactoring by @dandavison in #834
-Store history file in data_local_dir for Windows by @rashil2000 in #847
-Query fewer processes when searching for the parent by @th1000s in #841
-Do not query CPU data when querying process data by @dandavison in #845
-Fix --word-diff / --color-words handling by @dandavison in #833
-Add features from DELTA_FEATURES env var instead of replacing with them by
@dandavison in #849
-Fix raw line styles by @dandavison in #850
-Fix side-by-side syntax ANSI test failure by @dandavison in #852
-DeltaTest inspect() additions by @dandavison in #853
-Line state refactor by @dandavison in #851
git-delta: update to 0.8.3. Updated provided by Michael-John Turner on pkgsrc-users. 0.8.3 This release fixes a security vulnerability (CVE-2021-36376) on Windows. Please update if you are using Windows. 0.8.2 This is a bug fix release: the bug occurs when using delta to diff files whose names contain spaces. It does not affect use of delta as git's pager. 0.8.1 This is mainly a bug fix release: filenames containing spaces were causing crashes due to a regression in 0.8.0. It also includes a fix for the delta file_a file_b "diff mode" usage style, and an improvement for the diff-highlight / diff-so-fancy emulation modes. 0.8.0 New option relative-paths causes all file paths to be printed relative to the current directory so that they can be easily opened in a text editor or used in a shell command. Using hunk-header-style = file line-number syntax will emit the line number with the file path and thus should allow your editor to open at the correct line. For example, in the VS Code integrated terminal this means that with no further configuration every file path in git output can be opened with ctrl-click/cmd-click, and opening at a specific line works. Use diff-stat-align-width to control horizontal alignment of diff stat sections, although this may be replaced by a better solution in the future. #552 New option commit-regex allows delta to work nicely with custom git log formats (#174) Support git -c delta.foo=bar ... in latest git version #573 Support custom hyperlink hash formats #613 Allow custom themes to be defined as light themes #598 Transform file paths to be relative to current directory #552 delta file_A file_B now invokes git diff, instead of diff -u (older changes at https://github.com/dandavison/delta/releases)
reset maintainer
Add git-delta 0.4.4 A viewer for git and diff 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.