All links of one day in a single page.
First, clear the mess:
git reset --hard HEAD
Then, cherry-pick the commit you are currently rebasing:
git cherry-pick -n `git rev-parse REBASE_HEAD`
That's it. As usual, you will be able to continue the rebase after fixing conflicts
-- Pierre