#difftastic — Public Fediverse posts

Just tried difftastic and it's really cool.
https://difftastic.wilfred.me.uk/

The diffs are really helpful to be honest. A small but impactful improvement in workflow.
In my jj config, I used difftastic as the default diff tool. Thanks to home manager I already got an option to just to my jj config🙂.

#difftastic
#nix #homemanager #jj #config #diff #tool #git

Any such tool recommendations are welcome 😊
Thanks in advance

Do you love difftastic?

Do you love magit?

magit-difftastic brings harmony to the two.

https://github.com/rschmukler/magit-difftastic

#magit #difftastic #git #emacs

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

@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

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 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?

@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

@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

I really like magit diff view with @wilfredh #difftastic in #emacs. For details how to set everything up see https://tsdh.org/posts/2022-08-01-difftastic-diffing-with-magit.html

@blaue_Fledermaus

Adding support for #difftastic

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

Using

```
[includeIf "gitdir:~/work/"]
path = ~/path/to/work/.gitconfig
[includeIf "gitdir:~/personal/"]
path = ~/path/to/pesronal/.gitconfig
```

so you can use different git configurations for different paths.

Using diff3 for conflicts

```
[merge]
conflictStyle = diff3
```

I have the fantastic #difftastic configured as my default in #git

This works well for me 99% of the time but on the rare occasion I need to produce a patch it doesn't.

The solution...add an alias.

```
[alias]
patch = diff --no-ext-diff
```

(Thankfully `git patch` isn't taken although `git patch-id` does exist).

#git #difftastic #patch #alias

The popularity of "modern" replacements for classic #unix #commandline tools is an interesting phenomenon. Many are born from fresh perspectives and experimentation, which is great. But saving a few cpu cycles and fancier output is not enough to make me abandon a familiar, trusted and ubiquitous tool.

However, #Mergiraf & #Difftastic bring a lot more to the table. Syntax-aware merge conflict resolution and diffing has now become essential to me.

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

@davidshq The excellent `difftastic`

http://difftastic.wilfred.me.uk/

#difftastic #diff #git

@wilfredh it's very similar to #difftastic in spirit so I'm curious what you think of it :)

@podfeet I've configured Git (and Magit 😉 ) to use #difftastic which is brilliant as I prefer my diffs side by side rather than line-by-line.

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

Configuration is done at the global #git level rather than the client so it may "Just Work(TM)" in GitKraken (but no guarantees.

I’ve been using #difftastic as my primary diff tool in #git. Plainly, side-by-side display is the best, but my monitors are too small. I don’t see enough width in this view. So I’m using inline and I’m just not getting enough out of the tool. Difftastic is great, it just may not be for me.

@wilfredh Do you by chance have any knowledge if it is possible to call #DiffTastic from within #GoLang code?
My goal is to extend #Forgejo, so we can have better PR diffs etc.

#difftastic is language aware diff tool and it's awesome:
https://difftastic.wilfred.me.uk/

You can also replace `git diff` with it:
https://difftastic.wilfred.me.uk/git.html

#coding #git #linux

#diff vs #difftastic vs #delta

Brilliant, just discovered there is an Emacs package that nicely wraps the excellent #difftastic from @wilfredh

I can replace the custom functions I had hacked together

pkryger/difftastic.el: Wrapper for difftastic
https://github.com/pkryger/difftastic.el

@b0rk I like the brilliant #difftastic from @wilfredh

Has simple configuration instructions for Git at https://difftastic.wilfred.me.uk/git.html#regular-usage