How about adding a configuration/command-line switch for to-master creating merge bubbles (rebase origin/master && checkout origin/master && merge --no-ff feature-branch && push)?
We really like how they mark all commits done on a feature branch when reviewing the history.