scikit-image/scikit-image — pull request #593 by ahojnnes (2013-06-16 19:29:33+00:00)
Title: Rebase workflow

* Changed name of origin to upstream and user branch to origin, because origin is the default name for the own fork and I think changing its name confuses more than it helps.

* Since this question comes up in nearly each PR, I added a more detailed description about the rebase workflow.