allow unstaging files marked for deletion
allow adding UU files (merge conflicts)

so you can rebase --continue, for example.