Mastodawn

En plus de #difftastic, j'utilise aussi #Delta

Je trouve l'affichage plus facile à comprendre dans la plupart des cas

Delta permet notamment de :
* cacher le numéro de chaque ligne : permettant de copier d'ancienne ligne sans devoir supprimer les numéros des lignes à la main
* afficher les lignes supprimées / ajoutées avec une couleur
* afficher les mots supprimés / ajoutés avec une autre couleur

https://dandavison.github.io/delta/

Tu connais ?

#git #dev

Shae Erisson Mar 2

My gym buddy Maddie just pointed out to me that the advantage of delta [1] over #difftastic [2] is that delta does syntax highlighting in the diff!

I am really tempted to switch to delta for that one spiffy feature.

[1] https://github.com/dandavison/delta

[2] https://github.com/Wilfred/difftastic/issues/541

GitHub - dandavison/delta: A syntax-highlighting pager for git, diff, grep, and blame output

A syntax-highlighting pager for git, diff, grep, and blame output - dandavison/delta

GitHub

Show thread

Yann Büchau

Mar 2

@abcdw Yes, #difftastic *can* produce a much nicer diff, but only in some cases like this. I have several diff aliases, because there isn't one to rule them all. My favorite is

git diff --word-diff=color --word-diff-regex='[^[:space:][:punct:]]+'

Not perfect as it swallows some non-text characters, but very compact, whereas difftastic is often very noisy for me.

Andrew Tropin Feb 27

Trying out structural diffs. The diffs using language's syntax instead of just text lines.

#difftastic #treesitter #git #emacs #magit and all that.

https://youtube.com/live/pARy5XnLHKQ

#rde #guix

Moving to Structural Diffs | Trying out Difftastic

YouTube

Mathias Hasselmann Feb 12

RE: https://fosstodon.org/@robinm/116056737177373004

Need some help with your merge conflicts? Maybe give Mergiraf and Difftastic a try!

#git #mergiraf #difftastic

alanxoc3 Jan 30

I'm feeling chatty today. Something else I did recently is switch from diff-so-fancy to difftastic as my diff/gitdiff tool.

https://difftastic.wilfred.me.uk/

I like the format of #difftastic much more. It is smart enough to output side-by-side diffs when they make sense and inline or vertical diffs when those make sense.

I recommend trying it out!

Alejandro Baez Dec 10

I finally started using #difftastic... and it's brilliant! 😍

I got so used to mentally parsing what changes, I hadn't noticed how much until truly trying this out. 😅

Moral of the story: try new things. You may find something good. 😎

https://difftastic.wilfred.me.uk/introduction.html

Introduction - Difftastic Manual

The manual for difftastic, the structural diff tool

Antonin Delpeuch Sep 21, 2025

Hi @wilfredh, are you still interested in getting #difftastic packaged for #debian? On the debian side, it's now looking pretty good: #treesitter grammars are being packaged (tree-sitter 0.21 currently in unstable, 0.25 in experimental). So if we managed to unvendor all the parsers out of difftastic, we'd be really close! I'm wondering if I can help with the unvendoring - would you welcome PRs towards that?

Samuel Chase Jul 7, 2025

#difftastic has been such a gamechanger for getting a sense of what actually is happening in diffs.

For a language like Clojure, one seemingly small change in s-exp structure normally shows up as a 50-line diff, but with a syntax aware #diff like difftastic, it only shows what has actually changed, ignoring the changes in indentation that usually happens.

Many thanks to @wilfredh for making, and continuing to maintain such a useful tool!

Install it!

https://github.com/Wilfred/difftastic

GitHub - Wilfred/difftastic: a structural diff that understands syntax 🟥🟩

a structural diff that understands syntax 🟥🟩. Contribute to Wilfred/difftastic development by creating an account on GitHub.

GitHub

Show thread

robinm Apr 12, 2025

@mdk I'm using [mergiraf](mergiraf.org/) since about 2 months. It's has much fewer false positive than the default line based merge algorithm, but a bit more false negative. It does use tree sitter to compare and merge, a bit like what [difftastic](difftastic.wilfred.me.uk/) does for diffing files.

#treesitter #mergiraf #difftastic