From: Jeff King <peff@peff.net>
Date: Thu, 08 Nov 2007 03:23:10 GMT
Subject: Re: git rebase --skip
Message-ID: <20071108032308.GA5638@sigill.intra.peff.net>
In-Reply-To: <20071107222105.GA31666@glandium.org>

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.

-Peff