git visual diff between branches

Question

This answer is great for seeing a visual diff between two files that are checked into git: How do I view 'git diff' output with a visual diff program?

Howev

Answer 1

You can also do this easily with gitk.

> gitk branch1 branch2

First click on the tip of branch1. Now right-click on the tip of branch2 and select Diff this->selected.

Answer 2

UPDATE

Mac: I now use SourceTree. Thoroughly recommended. I especially like the way you can stage / unstage hunks.

Linux: I've had success with:

• smartgit
• GitKraken
• meld

E.g. to install smartgit on Ubuntu:

• download the .deb from https://www.syntevo.com/smartgit/download/
• install with sudo dpkg -i /path/to/deb`

---

This does the job:

git-diffall with a GUI diff tool like meld. See point 5 here:

http://rubyglazed.com/post/15772234418/git-ify-your-command-line

There's a nice post about git and meld here: http://nathanhoad.net/how-to-meld-for-git-diffs-in-ubuntu-hardy

Answer 3

In GitExtensions you can select both branches in revision grid with Ctrl pressed. Then you can see files that differ between those branches. When you select a file you will see diff for it.

Taken from here

Answer 4

For those of you on Windows using TortoiseGit, you can get a somewhat visual comparison through this rather obscure feature:

1. Navigate to the folder you want to compare
2. Hold down shift and right-click it
3. Go to TortoiseGit -> Browse Reference
4. Use ctrl to select two branches to compare
5. Right-click your selection and click "Compare selected refs"

Source: http://wikgren.fi/compare-diff-branches-in-tortoise-git-or-how-to-preview-changes-before-doing-a-merge/

Answer 5

If you use Eclipse you can visually compare your current branch on the workspace with another tag/branch:

Answer 6

In case you are using Intellij Idea IDE, you could just use the compare option in the branch.