In my work process I need to provide a list of files to my server admin. The list comes from the merge of my working branch (Branch A) into Master branch.
So I merge
Narrow it down using git log --merges --author
to figure out the commit you want and then try
git diff --name-only ${MERGE_SHA}^1..${MERGE_SHA}
I find it useful to narrow the path to first parent in order to ignore "update branch" merges.
Looks like this for me:
git log r2.8.7-2018-09-04..HEAD --merges --first-parent