I want to merge two branches that have been separated for a while and wanted to know which files have been modified.
Came across this link: http://linux.yyz.us/git-howto.html which was quite useful.
The tools to compare branches I've come across are:
git diff master..branch
git log master..branch
git shortlog master..branch
git diff master..branch | grep "^diff"
$ git diff --name-status master..branchName
That should do what you need, if I understand you correctly.