use matchadd to allow multiple highlights
add a short script to setup a branch for auto-rebasing