Fix visual bugs on rebase

* Suppress unneeded error output
* Fix improper display of rebase indicator