rebase: fix rewritten list for failed pick