rebase -i: re-fix short SHA-1 collision