Git see all diff

Question

I want to see the whole patch applied by merging as a separate diff output. In bzr, this is the standard (for example, if you look at diff at the merge point, you get all the diff resulting from this merge). In git, I don't see how to get this unified view of merging. Using gitk, I have to click on each individual commit in the branch. I want to see the whole branch as a single commit.

I know that I can simply manually find the branch point and make the difference between the two points, but this is prone to errors. How can I see all diff for merge?

Answer 1

Suppose your merge has a hash of "1234abc". What you can do is run:

git diff 1234abc^1 1234abc 

Quite a lot of the “before” comparison is displayed after the comparison.