This differs from my old git-resquash.sh in that it uses the newer `git rebase --keep-base` if available
