Hello, even though git-rebase -i is still young, I'm already a big fan of it. I just want to suggest two minor things: - If a cherry-pick fails, it tells me to resolve my conflicts, 'git add <paths>' and to do 'git commit -c $sha1id'. But it doesn't tell me, how I continue to rebase after that. 'git rebase -i --continue' works. - If a cherry-pick of a commit to be squashed fails, the instruction to do 'git commit -c $sha1id' is wrong, because then I don't get both message to squash. Best regards Uwe -- Uwe Kleine-König http://www.google.com/search?q=12+mol+in+dozen - 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