Re: git rebase --skip

[Junio C Hamano <gitster@pobox.com>]

Jeff King <peff@peff.net> 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.

Or we could introduce a new option "--drop" (that's "drop the
current commit and continue") to do so, if people find that the
word "skip" does not sound like a scary destructive operation.

But I do not think that is needed.