Top
Best
New

Posted by flamestro 6 hours ago

Show HN: Deff – side-by-side Git diff review in your terminal(github.com)
deff is an interactive Rust TUI for reviewing git diffs side-by-side with syntax highlighting and added/deleted line tinting. It supports keyboard/mouse navigation, vim-style motions, in-diff search (/, n, N), per-file reviewed toggles, and both upstream-based and explicit --base/--head comparisons. It can also include uncommitted + untracked files (--include-uncommitted) so you can review your working tree before committing.

Would love to get some feedback

60 points | 41 commentspage 2
teddyh 4 hours ago|

  emacs --eval='(ediff-files "file1" "file2")'
(The “|” key toggles side-by-side view.)
flamestro 2 hours ago||
Yes, but emacs < vim
dingnuts 4 hours ago||
[dead]
hatradiowigwam 3 hours ago||
vimdiff is pretty fast, and is likely installed on your linux system without you realizing it.
flamestro 2 hours ago|
Its a great tool, but misses some of the context I needed.
dec0dedab0de 2 hours ago||
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.

insane_dreamer 3 hours ago|
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.

flamestro 2 hours ago|
What would the third panel contain in this case? Do you mean the setup that IntelliJ has in merge conflicts?