Show HN: Deff – side-by-side Git diff review in your terminal

Re:Show HN: Deff – side-by-side Git diff review in your term... by insane_dreamer on Thursday February 26, 2026 @03:29PM (#47171594)

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.

[ Parent | on HN ]

Re:Show HN: Deff – side-by-side Git diff review in your term... by flamestro on Thursday February 26, 2026 @04:16PM (#47172107)

What would the third panel contain in this case? Do you mean the setup that IntelliJ has in merge conflicts?

[ Parent | on HN ]

Re:Show HN: Deff – side-by-side Git diff review in your term... by insane_dreamer on Thursday February 26, 2026 @10:50PM (#47176264)

yes, it shows the final merge (what was accepted from the left and right panels); very handy

[ Parent | on HN ]

Re:Show HN: Deff – side-by-side Git diff review in your term... by lolive on Friday February 27, 2026 @05:47AM (#47178992)

unfortunately for terminal lovers, the best .gitconfig snippet is still this:

  [diff]
    tool = intellij
  [difftool "intellij"]
    cmd = idea diff \"$LOCAL\" \"$REMOTE\"
  [merge]
    tool = intellij
  [mergetool "intellij"]
    cmd = idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
    trustExitCode = true

[ Parent | on HN ]