Hi, I use git-rebase quite regularly, and I haven't used git-rebase --skip after a failed merge without first resetting the working tree. I was wondering if it wouldn't make sense to automatically do the reset when running git-rebase --skip. Mike - 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