#difftastic — Public Fediverse posts

Salut @pascal_le_merrer

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

Salut @pascal_le_merrer

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

Salut @pascal_le_merrer

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

Salut @pascal_le_merrer

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

Salut @pascal_le_merrer

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

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

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

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

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

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

@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.

@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.

@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.

@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.

@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.

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

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

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

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

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

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

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

#git #mergiraf #difftastic

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

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

#git #mergiraf #difftastic

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

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

#git #mergiraf #difftastic

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

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

#git #mergiraf #difftastic

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

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

#git #mergiraf #difftastic

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!

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!

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!

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!

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

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

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

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

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

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?

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?

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?

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?

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?

@sandro just like #difftastic is syntax-aware, we need a grep with the same capabilities.

All too often I fail to find a line of code because it's wrapped or there's an unexpected variable interpolation in the middle of a string etc.

@sandro just like #difftastic is syntax-aware, we need a grep with the same capabilities.

All too often I fail to find a line of code because it's wrapped or there's an unexpected variable interpolation in the middle of a string etc.

@sandro just like #difftastic is syntax-aware, we need a grep with the same capabilities.

All too often I fail to find a line of code because it's wrapped or there's an unexpected variable interpolation in the middle of a string etc.

@sandro just like #difftastic is syntax-aware, we need a grep with the same capabilities.

All too often I fail to find a line of code because it's wrapped or there's an unexpected variable interpolation in the middle of a string etc.

@sandro just like #difftastic is syntax-aware, we need a grep with the same capabilities.

All too often I fail to find a line of code because it's wrapped or there's an unexpected variable interpolation in the middle of a string etc.

Since y'all liked 🔀🦒 #Mergiraf so much (a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't), go check out ≏🤩 #Difftastic too! It's a syntax-aware #diff tool that produces finer grained, much easier to read output than classic #GNU #diffutils or #BSD diff. No more decoding "@@ -5,6 +5,7 @@"! Integrates nicely with #git as well.

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

#opensource #coding #programming #cvs #difftool

Since y'all liked 🔀🦒 #Mergiraf so much (a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't), go check out ≏🤩 #Difftastic too! It's a syntax-aware #diff tool that produces finer grained, much easier to read output than classic #GNU #diffutils or #BSD diff. No more decoding "@@ -5,6 +5,7 @@"! Integrates nicely with #git as well.

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

#opensource #coding #programming #cvs #difftool

Since y'all liked 🔀🦒 #Mergiraf so much (a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't), go check out ≏🤩 #Difftastic too! It's a syntax-aware #diff tool that produces finer grained, much easier to read output than classic #GNU #diffutils or #BSD diff. No more decoding "@@ -5,6 +5,7 @@"! Integrates nicely with #git as well.

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

#opensource #coding #programming #cvs #difftool

Since y'all liked 🔀🦒 #Mergiraf so much (a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't), go check out ≏🤩 #Difftastic too! It's a syntax-aware #diff tool that produces finer grained, much easier to read output than classic #GNU #diffutils or #BSD diff. No more decoding "@@ -5,6 +5,7 @@"! Integrates nicely with #git as well.

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

#opensource #coding #programming #cvs #difftool

Since y'all liked 🔀🦒 #Mergiraf so much (a syntax-aware #git #merge driver that solves many conflicts automatically that git's built-in merge strategies can't), go check out ≏🤩 #Difftastic too! It's a syntax-aware #diff tool that produces finer grained, much easier to read output than classic #GNU #diffutils or #BSD diff. No more decoding "@@ -5,6 +5,7 @@"! Integrates nicely with #git as well.

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

#opensource #coding #programming #cvs #difftool

@jbaty You can use the amazing difftastic to diff directories visually. Its beautiful and "Just Works"

```
difft <dir1> <dir2>
```

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

#difftastic