Diff Tools

diffr – word-by-word diff highlighting utility

diffr is a terminal filter that makes unified diff output more precise by identifying changes within individual lines. This is particularly helpful with long or similar lines where a conventional line-oriented comparison shows that a line changed without making the exact edit immediately obvious.

The program works one hunk at a time and performs an additional word-level comparison using a longest-common-subsequence algorithm. It follows the Unix filter model, reading diff data from standard input and writing the refined result to standard output.

This is free and open source software.

Key Features

  • Adds word-level refinement to ordinary unified diff output.
  • Keeps the underlying unified diff structure while adding terminal text attributes to changed regions.
  • Processes comparisons hunk by hunk rather than requiring the complete diff to be reformatted into a proprietary representation.
  • Uses Myers’ longest-common-subsequence algorithm when refining changed content.
  • Handles UTF-8 text while keeping grapheme clusters together during tokenisation.
  • Supports configurable colours for changed, added, removed and common text segments.
  • Can use dimmed text attributes to reduce visual emphasis on unchanged content.
  • Offers optional line numbers for diff hunks.
  • Reads from standard input and writes to standard output, making it easy to combine with other command-line tools.
  • Works directly with output from commands such as git show.
  • Can be configured as Git’s pager.
  • Can also be configured as Git’s interactive diff filter.
  • Does not replace the underlying diff calculation, allowing users to retain their existing Git and diff workflows.

Website: github.com/mookid/diffr
Support:
Developer: Nathan Moreau
License: MIT License

diffr
Click for full size image

diffr is written in Rust. Learn Rust with our recommended free books and free tutorials.


Related Software

Terminal-Based Diff Tools
difftasticStructural diff tool that compares files based on their syntax
hunkTerminal diff viewer with syntax highlighting and side-by-side views
diff-so-fancyAttractive diffs with diff-highlight and more
deltaViewer for git and diff output
icdiffAn improved colored diff
diffoscopeIn-depth comparison of files, archives, and directories
colordiffWrapper for diff with pretty syntax highlighting
diffsitterSemantic diff tool
objdiffLocal diffing tool for decompilation project
ydiffTool to view colored, incremental diff in a version controlled workspace
diffrWord-by-word diff highlighting utility
dyffdiff tool for YAML files
WdiffWordwise implementation of diff
dwdiffdiff program that operates at the word level
diffymlCompares YAML documents by their structure
oyoStep-through diff viewer
diff2html-cliGenerate HTML diffs
biodiffTerminal-based binary diff viewer
dirdiffCompute the differences between two directories
csvdiffFast diff tool for comparing CSV files
VBinDiffVisual binary diff
riffWrapper around diff
csv-diffDiffing CSV and JSON files
xmldiffCompare XML documents
PatdiffFile diff using the Patience Diff algorithm
dead-ringerBinary diff utility
sesdiffGenerates a shortest edit script
semdiffSemantic diff tool written in Rust

Read our verdict in the software roundup.

Git Tools for Diff Review and Repository History
difftasticStructural diff tool that compares files based on their syntax
git-filter-repoQuickly rewrite git repository history
onefetchDisplays information about a local Git repository
git-statsLocal git statistics including GitHub-like contributions calendars
diff-so-fancyAttractive diffs with diff-highlight and more
BFG Repo-CleanerClean unwanted data from Git repository history
git-deltaViewer for git and diff output
gitlogueCinematic Git commit replay tool
git-quick-statsAccess various statistics in a git repository
git-whoCommand-line Git analysis tool
git-standupRecall what you did on the last working day
git-of-theseusAnalyze how a Git repo grows over time
git-sizerCompute various size metrics for a git repository
diffnavGit diff pager based on delta but with a file tree, à la GitHub
critiqueTerminal UI for reviewing git diffs
git-big-pictureVisualization tool for Git repositories
herculesGain advanced insights from Git repository history
keifuTUI that visualizes Git commit graphs
git-fameGit repository collaborators sorted by contributions
needleHighlights GitHub PRs
mergirafGit merge driver
git-historyAnalyze Git history using SQLite
ecTerminal Git mergetool
diffrWord-by-word diff highlighting utility
git-scopeFast TUI dashboard to view the git status of all your repositories
mamediffManages unstaged and staged Git diffs
deadbranchKeep Git repositories tidy
GitTopLightweight desktop client for GitHub notifications
git-heatmapGenerates a customizable heatmap

Read our verdict in the software roundup.


Best Free and Open Source Software Explore our carefully curated directory of recommended free and open source software, covering every major software category.

The directory forms part of our extensive collection of articles for Linux enthusiasts. It includes hundreds of detailed reviews, together with free and open source alternatives to proprietary software from companies such as Google, Microsoft, Apple, Adobe, IBM, Cisco, Oracle, and Autodesk.

LinuxLinks also covers interesting projects worth exploring, Linux-compatible hardware, free programming books and tutorials, and much more.

Know a useful free and open source Linux application that we haven’t covered? Tell us about it using our submission form.
Subscribe

Please read our Comment Policy before commenting.

Notify of
guest
0 Comments
Oldest
Newest Most Voted