diffr
diff-so-fancy
| diffr | diff-so-fancy | |
|---|---|---|
| 3 | 22 | |
| 519 | 17,090 | |
| - | 0.3% | |
| 5.7 | 7.1 | |
| 29 days ago | 18 days ago | |
| Rust | Perl | |
| MIT License | MIT License |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
diffr
-
How to see word-diff and moved lines?
I use diffr since, it shows small changes in long lines nicely.
-
Meld is a visual diff and merge tool targeted at developers
For visualization I really like kdiff3. Or on terminal https://github.com/mookid/diffr with specific settings that use 256 colors the highlights word differences as well.
But for manual merging I haven't found anything better than ediff. That's the only reason I install emacs on my work machines. Seemless integration into a text editor is just unbeatable.
-
Difftastic: Syntax-aware structured diff tool
I wrote diffr [0] for that purpose; it serves me well, especially if your team makes code with long lines.
In my opinion, a simple approach that does NOT make any parsing is more efficient (what about bugs in your parser? code with syntax errors? also, how fast would the parser be?)
[0]: https://github.com/mookid/diffr
diff-so-fancy
-
Difftastic, a structural diff tool that understands syntax
The diff itself is impressive, but in terms of styling I still prefer diff-so-fancy[1]. It's easier to read at a glance.
[1]: https://github.com/so-fancy/diff-so-fancy/
-
How to improve the readability of diffs? Preferably in Terminal, but a desktop application would be acceptable too
I don't have much hope for this being improved anytime soon in diff-so-fancy given this issue, so I'm wondering if there's something else I can use in Terminal that would allow me to have an experience like GitLab. If that's not possible and I have to rely on a desktop application, that would be acceptable too.
- How to see word-diff and moved lines?
-
Git Learnt
This is actually one that's really easy to write and remember but I hate typing and I run it all the time, so I've aliased it down to gd for git-diff. Also I use diff-so-fancy to make the output of my diffs look frickin sweet and I suggest you do the same.
-
diff: can I increase highlighting of a file name?
I recommend a tool like diff-so-fancy with some custom colors. You will never want to go back to vanilla diffs.
-
TIL: diff-so-fancy; and some funky git config
I just discovered diff-so-fancy, and very nice it is too. I immediately added it to my standard git config, which is semi-automatically installed on every machine I use. However, I've not (yet) installed diff-so-fancy on all the machines I use, and for those platforms for which it's not packaged I probably won't bother installing it from source.
-
Suggestion on how to set up neovim as a diff/merge tool for git with dir-diff in mind
I recently switched to diff-so-fancy for use in the terminal with the following configuration:
-
Let's add Git userdiff defaults for Perl and Perl 6
As the primary author of diff-so-fancy, which is entirely Perl, I fully support this endeavor.
-
A Better Git Diff with Delta
Instead of delta https://github.com/dandavison/delta (shown in the previous video), I've also used diff-so-fancy https://github.com/so-fancy/diff-so-fancy and I've heard difftastic is good as well https://github.com/Wilfred/difftastic Do you use one of those or something else?
-
Post your favorite programs
diff-so-fancy - syntax highlighting for diffs, including highlighting just the part of the line that changed: diff -ru ... | diff-so-fancy | less -R
What are some alternatives?
ydiff - View colored, incremental diff in workspace or from stdin with side by side and auto pager support
delta - A syntax-highlighting pager for git, diff, and grep output
gumtree - An awesome code differencing tool
vim-gitgutter - A Vim plugin which shows git diff markers in the sign column and stages/previews/undoes hunks and partial hunks.
difftastic - a structural diff that understands syntax 🟥🟩
git-split-diffs - Syntax highlighted side-by-side diffs in your terminal
locust - "git diff" over abstract syntax trees
git-extras - GIT utilities -- repo summary, repl, changelog population, author commit percentages and more
kdiff3 - KDiff3 updated for Windows
vscode-angular-snippets - Angular Snippets for VS Code
meld - Meld
diffview.nvim - Single tabpage interface for easily cycling through diffs for all modified files for any git rev.