GIT diff GUI

Question

I have a rather large diff of 2 GIT branches and would like to open them in some sort of nice UI side by side. Something that shows me the diff's easily, and hopefully that I can merge differences one by one. git diff is rather hard to work with.

Solution 1

The answer is git difftool (at least for git version 1.6.3 and later). Please remember that it just invokes configured or automatically found graphical diff tool.

Solution 2

I use kompare:

git diff | kompare -

kompare is not limited to git, you may also do

svn diff | kompare -
bzr diff | kompare -
diff -Naur clean/ patched/ | kompare -
kompare bug3.fix.diff

... you get the idea.

Solution 3

If you are in the process of merging, git diff has a really nice syntax where the first two columns show the parentage of each line, in a kind of unified merge diff. From there it's easy to resolve the conflicts with any editor.

Do you have the pretty colors turned on? Here's a snippet from my ~/.gitconfig:

[color]
    diff = auto
    branch = auto
    status = auto
    interactive = auto

Anyway, take a look at kdiff3, for instance. You can specify the tool to be used for merging, see the git-mergetool docs for details.