I have a task where I am supposed to generate a changelog based on all the changes that were created in the branches (develop, feature-X), then merged into master, and tagged into a release branch.
Note that feature-X is always branches off of develop, and merged back into develop, and finally, develop is merged into master.
I tried:
git diff HEAD..<release-branch>
git log <a-know-revision>..HEAD
But I don't think either of those works for my case