I'm merging a branch back to master.
I set following git config to force merge-commit:
When doing git checkout master followed by git merge dev in a terminal, git opens an editor to let me type in an appropriate merge-commit message.
In Egit:
when right-clicking on branch devin the history (master being checked...