Git: show diff between branches, ignoring commits merged in

Question

My repository history looks something like this:

         x---y-+-z-+-branch
        /     /   /
---a---b---c-+-d-+-e---master

I want to get a single diff (ie, like 'git diff' outputs- I don't want a whole bunch of diffs like 'git log -p' produces) of the complete history of 'branch', without including any of the changes that were merged into 'branch' from 'master'.

How can I do this?

Answer 1

The command you are looking for is:

git diff master...branch

From git help diff :

 git diff [--options] <commit>...<commit> 

This form is to view the changes on the branch containing and up to the second