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

Re: Aborting git rebase --edit-todo

From
Carlo Arenas <carenas@gmail.com>
Date
Sep 3, 2020, 18:55 UTC
Message-ID
<CAPUEspjKcQgLvVrJ2GroqYydNPksEziMgyceN-CFBFVgtngMuA@mail.gmail.com>
In-Reply-To
<xmqqa6y6ah8h.fsf@gitster.c.googlers.com>
On Thu, Sep 3, 2020 at 10:47 AM Junio C Hamano <gitster@pobox.com> wrote:
> Now we have the "drop" verb, the latter interpretation becomes
> possible without making it impossible for the user to express the
> former.

and for people that would like to enforce the use of the drop verb there is configuration that prevents deleted lines to "silently" dropping commits since 5a5445d878 (rebase-interactive: warn if commit is dropped with `rebase --edit-todo', 2020-01-28) :

  rebase.missingCommitsCheck

AFAIK the correct "signal" to abort is to instruct your editor to exit with non zero (ex: in vi using <esc>:cq), but agree it could be confusing or "inconsistent" and might be worth adding it a message at the footer

Carlo
Previous: Junio C HamanoNext: Victor Toni
Message 3 of 14 in “Aborting git rebase --edit-todo”
  1. Victor ToniSep 3, 2020
  2. Junio C HamanoSep 3, 2020
  3. Carlo ArenasSep 3, 2020
  4. Victor ToniSep 3, 2020
  5. Junio C HamanoSep 3, 2020
  6. Victor ToniSep 3, 2020
  7. Carlo ArenasSep 3, 2020
  8. Victor ToniSep 3, 2020
  9. Junio C HamanoSep 3, 2020
  10. Victor ToniSep 3, 2020
  11. Johannes SchindelinSep 4, 2020
  12. Junio C HamanoSep 6, 2020
  13. Johannes SchindelinSep 4, 2020
  14. Johannes SchindelinSep 4, 2020

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.