vim: fix window scrolling for * and #
git: always rebase on pull