How can I get 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