rebase-i-p: fix 'no squashing merges' tripping up non-merges