update pull-chenges-from-upstream

Consider using rebase as preferred way to pull changes from upstream.