once more, gitlab does it right and offers a "rebase" button on merge requests along with a "fast-forward merges only" option for repositories.

See http://doc.gitlab.com/ee/workflow/rebase_before_merge.html