On 2007.11.08 15:52:08 -0800, Junio C Hamano wrote: > Jeff King <peff@xxxxxxxx> writes: > > > Personally, I don't see the point of a --force option; it turns your work > > flow from: > > > > 1. git-rebase --skip > > 2. Oops, I guess I have to reset. > > 3. git-reset --hard; git-rebase --skip > > > > to: > > > > 1. same as above > > 2. same as above > > 3. git-rebase --force --skip > > I do not see it as improvement, either, for the same reason you > state. > > > AIUI, Andreas's proposal is not so much DWIM as "do the obvious thing, > > but include a safety valve to prevent throwing away work." Is there > > actually a case where it would not have the desired effect? > > The user is explicitly saying --skip, so I do not think it is > dangerous even if we unconditionally did "reset --hard" at that > point. The user _must_ say --skip in the case I outlined. And I'm pretty sure that the first thing I'll (accidently) do once --skip implies "reset --hard" is to forget to commit. Murphy has never let me down. How about adding that --amend option that someone mentioned? Or even just letting --continue act like --skip when there's nothing to commit. That way, you're no longer forced to use --skip. Björn - 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
