I'm rebasing a feature branch on to master, non-interactively: `git rebase feature master`.

During this process a series of conflicts come up and I resolve them manually one at a time. However, on conflict #3 I forget to save a file with a series of extensive changes, and just blindly `git add` the file, conflicts and all, and `git rebase --continue`.

Now I'm at another conflict, and the because of the previous conflict the file looks like a huge mess. `git rebase` offers me `--continue`, `--skip`, and `--abort`, and I don't want to do any of those: I want to "back up" to the previous commit and save the changes I forgot to save before "re-applying" the patch at this step of the rebase.

What's the easiest way to accomplish this?