johannix johannix - 2 months ago 6
Git Question

Showing which files have changed between two revisions

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



Was wondering if there's something like "git status master..branch" to only see those files that are different between the two branches.

Without creating a new tool, I think this is the closest you can get to do that now (which of course will show repeats if a file was modified more than once):


  • git diff master..branch | grep "^diff"



Was wondering if there's something I missed...

Answer

Try

$ git diff --name-status master..branchName

That should do what you need, if I understand you correctly.