rebase problems

Recently, rebasing has stopped working for me. Here is an example:

bash-3.00$ git-show-branch origin HEAD
! [origin] fix in which we remove the definition of index statements that are *not* used in the control vector
 ! [HEAD] propagate LinearizationType typo fix.
--
 + [HEAD] propagate LinearizationType typo fix.
 + [HEAD^] LinearizationType: typo
 + [HEAD~2] espam::DecomposeChannels: actually decompose the channel if valid.
 + [HEAD~3] DecomposeChannels: split channel and check whether result is a pair of fifos.
 + [HEAD~4] Use proper class for LinearizationType.
 + [HEAD~5] espam/../DecomposeChannels: partial implementation.
 + [HEAD~6] espam: add flag for channel decomposition.
+  [origin] fix in which we remove the definition of index statements that are *not* used in the control vector
++ [HEAD~7] espam/../IndexVector::toString: include contents of IndexVector.
bash-3.00$ git rebase origin

Applying 'espam::DecomposeChannels: actually decompose the channel if valid.'

error: pa/espam/operations/transformations/DecomposeChannels.java: does not exist in index
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Trying simple merge.
Simple merge failed, trying Automatic merge.
ERROR: pa/espam/operations/transformations/DecomposeChannels.java: Not handling case 09322db769adbc03bfd4f3ac2720c6d1db5a85b1 ->  -> 32da8b1de4205c4adb0da50648a0a00d60b67582
fatal: merge program failed
Failed to merge in the changes.
Patch failed at 0007.
0001-espam-add-flag-for-channel-decomposition.txt

I'm not sure what rebase is doing here, but the only change in origin modified a file untouched by the changes in HEAD, so there shouldn't be any conflict whatsoever. Apparently it's trying to apply the change in HEAD~2 without having applied the earlier changes (which and the file named above).

skimo

PS: I'll try and look into the gitk thing this evening.