we are working with the branching model from Driessen (nvie.com/posts/a-successful-git-branching-model/).
When we do a Hotfix, and create 2 pull requests, one to the master branch the other to develop. After the merge we have a commit on Master, which is not on develop. So when doing another Hotfix, the PR to develop would contain the Commit "Merge into Master".
Is there any way to imlement the git merge --no-commit -ff into the pull request? Also, when there is a similar option for Mercurial?