git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 10, 2016, 19:07 UTC
Message-ID
<xmqqfumz6tnj.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CACsJy8CHWZyFgZu1=VKCQc+hbHUmZiAQ9ToL=NDF=YBEkLfbog@mail.gmail.com>
Duy Nguyen <pclouds@gmail.com> writes:
Show 21 quoted lines
> On Thu, Nov 10, 2016 at 6:09 PM, Duy Nguyen <pclouds@gmail.com> wrote:
>> On Thu, Nov 10, 2016 at 3:12 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>> Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> 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.

Previous: Duy NguyenNext: Nguyễn Thái Ngọc Duy
Message 9 of 10 in “rebase: add --forget to cleanup rebase, leave HEAD untouched”
  1. rebase: add --forget to cleanup rebase, leave HEAD untouchedNguyễn Thái Ngọc Duy, Oct 26, 2016
  2. Junio C HamanoOct 26, 2016
  3. Duy NguyenOct 27, 2016
  4. Junio C HamanoOct 31, 2016
  5. rebase: add --forget to cleanup rebase, leave everything else untouchedNguyễn Thái Ngọc Duy, Nov 9, 2016
  6. Junio C HamanoNov 9, 2016
  7. Duy NguyenNov 10, 2016
  8. Duy NguyenNov 10, 2016
  9. Junio C HamanoNov 10, 2016
  10. rebase: add --forget to cleanup rebase, leave everything else untouchedNguyễn Thái Ngọc Duy, Nov 12, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.