mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <>
To: Duy Nguyen <>
Cc: Git Mailing List <>
Subject: Re: [PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched
Date: Thu, 10 Nov 2016 11:07:12 -0800	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <> (Duy Nguyen's message of "Thu, 10 Nov 2016 18:22:31 +0700")

Duy Nguyen <> writes:

> On Thu, Nov 10, 2016 at 6:09 PM, Duy Nguyen <> wrote:
>> On Thu, Nov 10, 2016 at 3:12 AM, Junio C Hamano <> wrote:
>>> Nguyễn Thái Ngọc Duy  <> 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.
>> 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.

I think you are moving in the right direction, even though "Abort
it; unlike --abort, does this instead" is a bit hard to follow.

  reply	other threads:[~2016-11-10 19:07 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-26  9:46 [PATCH] rebase: add --forget to cleanup rebase, leave HEAD untouched Nguyễn Thái Ngọc Duy
2016-10-26 16:51 ` Junio C Hamano
2016-10-27 10:40   ` Duy Nguyen
2016-10-31 19:25     ` Junio C Hamano
2016-11-09  9:11 ` [PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched Nguyễn Thái Ngọc Duy
2016-11-09 20:12   ` Junio C Hamano
2016-11-10 11:09     ` Duy Nguyen
2016-11-10 11:22       ` Duy Nguyen
2016-11-10 19:07         ` Junio C Hamano [this message]
2016-11-12  2:00   ` [PATCH v3] " Nguyễn Thái Ngọc Duy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).