rebase -i: fix short SHA-1 collision