Jeff King wrote: > On Wed, Nov 07, 2007 at 11:21:05PM +0100, Mike Hommey wrote: > >> 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. > > I have often been annoyed by this behavior, too, and I can't think of > any situation where you _wouldn't_ want the reset to happen. But I > would be more comfortable hearing confirmation from others that they > can't think of such a situation. Perhaps "git rebase --force-skip" or "git rebase --force --skip" would be the way to fo above... -- 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