This question already has an answer here:
- How do I git diff on a certain directory 4 answers
As in the title, I want to have a diff file for a certain folder between the master branch and a branch I have created.
You can use
git diff master..yourbranch path/to/folder
git diff compares trees (as in hierarchies of source files at two different points in time), so it can't extract the changes done by a certain author. If you want to see what changes a user committed, then you need git log.
Does this solve your need?
git log --author=jdoe oldbranch..newbranch -p -- path/to/subdirectory > myChangesInSubdirectory.patch
This lists each commit done by jdoe between the two commits, printing them as a patch instead of the usual commit summary, limiting only to commits that have changes in the target subdirectory, and redirects the output to a file.
来源：https://stackoverflow.com/questions/12123633/differences-for-a-certain-folder-between-git-branches