@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.
@jbaty You can use the amazing difftastic to diff directories visually. Its beautiful and "Just Works"
```
difft <dir1> <dir2>
```
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
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
```
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.
@wilfredh Are there any regular users of #difftastic that use #Fossil? (wondering if someone has made tiny how to on how to configure #Fossil-scm for it)
@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.
@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 saved the day. what an amazing tool. #treesitter is really the gift that keeps on giving. https://github.com/Wilfred/difftastic
#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
@b0rk I like the brilliant #difftastic from @wilfredh
Has simple configuration instructions for Git at https://difftastic.wilfred.me.uk/git.html#regular-usage
"#Difftastic is a structural #diff #tool that understands syntax. It supports over 30 programming languages and when it works, it's fantastic."