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

[Bug?] "am --abort" broken?

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 12, 2013, 22:38 UTC
Message-ID
<7vsj0nymyd.fsf@alter.siamese.dyndns.org>

This is somewhat minor but will confuse people who do not know how to manually recover from. Start "am" without giving an input file by mistake:

    $ git am ;# no input file
    ^C

At this point, you are still in "am" session; completion will tell you that you are in a middle of "am/rebase". A more recent way to get out of this is to use "am --abort", but you get this:

    $ git am --abort
    Resolve operation not in progress, we are not resuming.

"git am" from 'maint' will help you get out of it, or you can do it the old fashioned way:

    $ rm -fr .git/rebase-apply

I think this is a recent breakage after merging the topic to add "rebase --autostash", but I haven't looked into it yet.

Next: Ramkumar Ramachandra
Message 1 of 3 in “[Bug?] "am --abort" broken?”
  1. Junio C HamanoJun 12, 2013
  2. Ramkumar RamachandraJun 13, 2013
  3. Junio C HamanoJun 13, 2013

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.