Replace rebase with a simple push.
Some better comments.