What Am I About to Merge with Git?
Very handy little snippet from aaron longwell's blog. I always have this happen to me on personal projects when I do something and then don't get back to it from real work till a few weeks later.
git co development # The destination branch git diff HEAD...topic-branch"</p>
the magic there is the ... In English, that symbol means show the difference between the common ancestor commit and HEAD.... in other words, only show what changes in the topic branch while it was distinct from the branch it's being merged into.