Johannes Schindelin wrote: > Usually, however, this results in a conflict which you have to resolve. > And _you_ do not have a hard time verifying that the patch already went > in, and you just say "git rebase --skip" and the rebasing will continue > _without_ having committed the now obsolete patch. Unfortunately, at least with git 1.4.4.x, not quite. You have to have index clean to do "git rebase --skip", while usually there would be conflict when applying patch that is already present some deeper. I think that is a bug in git-rebase. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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