12

Is there a way to use diff-highlight with git gui?

The extra highlighted info is invaluable when comparing lines that only changed a bit, and while using diff-highlight from the terminal (described here: http://coderwall.com/p/ydluzg/better-git-diff) is great, when I'm trying to make sense of large changes, I really like using the gui.

It doesn't look like there's much of a way.
I tried editing the Additional diff parameters in the gui and hacking on something like | diff-highlight, but that was no good.

Also worth noting: using --color-words is not a good workaround.
First, it breaks git gui. Second, the diff output isn't nearly as easy to read as that of a normal diff processed through diff-highlight.

1

1 Answer 1

0

Set up a standalone diff/merge app. Like Beyond Compare: https://www.scootersoftware.com/support.php?zz=kb_vcs or winmerge: https://coderwall.com/p/76wmzq/winmerge-as-git-difftool-on-windows , https://stackoverflow.com/questions/1881594/use-winmerge-inside-of-git-to-file-diff .

That will serve you much better. git-gui is a little Tcl/Tk afterthought app that's never going to get developed into anything more.

You can and also try to use one of the big IDE-s. Most of them know how to handle GIT and use their own diff modules.

2
  • 1
    With git gui, user can select some lines to stage them, while for other standalone dif/merge tools, they don't have such feature.
    – ollydbg23
    Jan 12, 2021 at 9:30
  • git gui is a glorious tool, not an afterthought ;_;
    – surj
    Jul 11, 2022 at 1:22

You must log in to answer this question.

Not the answer you're looking for? Browse other questions tagged .