GitHub adds rebase feature: https://help.github.com/articles/about-pull-request-merges/#rebase-and-merge-your-pull-request-commits