- I was looking for a good TUI tool for diffs recently, but I'm not sure yet if what I want exists already (and I don't think this tool does it (yet?)). I've been moving my workflow out of VSCode as I'm using TUI-driven coding agents more often lately but one thing I miss from my VSCode/GitHub workflow is the ability to provide a comment on lines or ranges in a diff to provide targeted feedback to the agent. Most diff tools seem to be (rightfully) focused on cleanly visualizing changes and not necessarily iterating on the change.
I admit I haven't looked super hard yet, I settled on configuring git to use delta [0] for now and I'm happy with it, but I'm curious if anyone has a workflow for reviewing/iterating on diffs in the terminal that they'd be willing to share. Also open to being told that I'm lightyears behind and that there's a better mental model for this.
[0] https://github.com/dandavison/delta/
- What I would love to see is "tig" replacement that is:
- even faster, especially if you have couple thousand files and just want to press "u" for some time and see them very quickly all get staged
- has this split-view diff opened for a file
Otherwise tig is one of my favorite tools to quickly commit stuff without too many key presses but with review abilities, i have its "tig status" aliased to "t"
- I have been using https://github.com/jeffkaufman/icdiff for the longest time to get side by side diffs.
by rileymichael
1 subcomments
- getting users to adopt a new tool with its own incantations is a tough sell. git supports specifying an external pager so folks can plug in alternatives (such as https://github.com/dandavison/delta) while still using the familiar git frontend
by ZoomZoomZoom
1 subcomments
- Why shouldn't this be a simple wrapper to tie Delta to some kind of file browser or a thing like television[1]?
[1]: https://alexpasmantier.github.io/television/
git difftool --tool=vimdiff
by jamiecode
2 subcomments
- The specific gap side-by-side covers for me is reviewing changes on a remote box without firing up an IDE. Delta is great but keeps the unified format. icdiff does the split view but is pretty barebones. So there's definitely space here.
What nobody's mentioned yet is difftastic. Takes a completely different approach - parses syntax trees instead of lines, so indentation changes and bracket shuffles don't show up as noise. Worth a look if you're comparing options.
Main question I'd have: how does it hold up on large files? 5k+ line diffs are where most of these tools either choke or produce unreadable output. That'd be the test I'd run first.
- Looks interesting. I'm currently using https://tuicr.dev/ , of which I like that the first screen it shows is the choice of commit range you want to review. Might be something to consider for deff?
- It blows my mind that nowadays, some random tools on internet tells you to do "curl -fsSL https://.... | bash" to install some "binary" things and a lot of people will do it without hesitation.
It probably explains why there is so many data leaks recently but it is like we did a 20 years jump back in time in terms of security in just a few years.
emacs --eval='(ediff-files "file1" "file2")'
(The “|” key toggles side-by-side view.)
- will this play well with jj?
by hatradiowigwam
1 subcomments
- vimdiff is pretty fast, and is likely installed on your linux system without you realizing it.
by dec0dedab0de
0 subcomment
- looks pretty good at a glance, though I would like to see three views for handling conflicts. Target on the left, source on the right, and the combined result in the middle.
...I really just like the way the Jetbrains IDEs do it, and I wish there were a TUI version that I could launch automatically from the git cli.
by insane_dreamer
1 subcomments
- we need something like this in lazygit -- which is excellent all around but lacking in visual diffing/merging.
What is most useful though is a 3-panel setup, like JetBrains -- still the best git client I have worked with.
Hacker News