Auto-rebase when pushing to feature branches

[STRd6]

To eliminate the "Empty commit" and squash all the others into one commit for the branch we should rebase and force-push our branch commits..

It may get more complex if we merge master into the branch, but maybe not.