From: Johannes Schindelin Date: Fri, 09 Nov 2007 10:59:57 GMT Subject: Re: git rebase --skip Message-ID: In-Reply-To: <20071109032227.GA31760@sigill.intra.peff.net> Hi, On Thu, 8 Nov 2007, Jeff King wrote: > So I am fine with the original patch (unconditional reset --hard), but > it would be nice to see the people who care submit concrete proposals > for such a safety valve. Isn't having to say "--skip" instead of "--continue" enough? Some people might complain that it's too easy to get your fingers wired to type --skip. In that case, I might beg to differ for two reasons: --skip is definitely not the default operation, so the fingers do not get any chance to do that, and even if, they would get wired to --force --skip just as easily. Besides, after my patch to rebase on a detached HEAD, it is very easy to go back to the original state and try again. Ciao, Dscho