Re: [PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched

Nguyễn Thái Ngọc Duy  [off-list ref] writes:

---
 v2 changes just the subject line

That's not sufficient, is it?  What you did in the documentation
would raise the same "Hmph, is this only about HEAD?" and unlike the
commit subject, it will carve it in stone for end-users.

On Thu, Nov 10, 2016 at 3:12 AM, Junio C Hamano [off-list ref] wrote:

Nguyễn Thái Ngọc Duy  [off-list ref] writes:

quoted

---
 v2 changes just the subject line

That's not sufficient, is it?  What you did in the documentation
would raise the same "Hmph, is this only about HEAD?" and unlike the
commit subject, it will carve it in stone for end-users.

Oops. I forgot about git-rebase.txt. How about this?

--forget::
        Abort the rebase operation but leave HEAD, the index and
working tree untouched.

And think that's all the things rebase touches.
-- 
Duy

On Thu, Nov 10, 2016 at 6:09 PM, Duy Nguyen [off-list ref] wrote:

On Thu, Nov 10, 2016 at 3:12 AM, Junio C Hamano [off-list ref] wrote:

quoted

Nguyễn Thái Ngọc Duy  [off-list ref] writes:

quoted

---
 v2 changes just the subject line

That's not sufficient, is it?  What you did in the documentation
would raise the same "Hmph, is this only about HEAD?" and unlike the
commit subject, it will carve it in stone for end-users.

Oops. I forgot about git-rebase.txt. How about this?

--forget::
        Abort the rebase operation but leave HEAD, the index and
working tree untouched.

Or, since --abort describes it as "reset HEAD to the original branch",
we could write "Abort the rebase operation. Unlike --abort, HEAD is
not restored back to the original branch". Index and worktree are
implied by "not restored". Not sure if it's too subtle.
-- 
Duy