Improving git-pull-and-rebase-onto