Hi, Try the following steps: % git checkout -b tmp v1.7.9 % git cherry-pick 6e1c9bb^2^ % git rebase -i --onto 6e1c9bb HEAD^ % git rebase --continue The rebase will finish, but there will be a .git/CHERRY_PICK_HEAD file. This doesn't happen if you run rebase without -i, or do rebase --skip instead. IIRC correctly rebase --continue used to work fine. Cheers. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html