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

Re: Dangerous "git am --abort" behavior

From
Adam Monsen <haircut@gmail.com>
Date
Dec 20, 2010, 19:35 UTC
Message-ID
<loom.20101220T203122-271@post.gmane.org>
In-Reply-To
<AANLkTinP4SArMkjvTXOEG=tf=8EcEdP9fPAB7F=iitSc@mail.gmail.com>
Linus Torvalds writes:
Show 5 quoted lines
> What happened today was that I had been doing a pull or two, and then
> applied an emailed patch with "git am" as usual. But as sometimes
> happens, I actually had a previous "git am" that had failed - in fact,
> it was the same patch that I applied today that had had an earlier
> version that no longer applied.

It would be helpful if "git status" mentioned if a rebase or am operation is in progress... this might have helped you avoid the situation described.

Previous: Linus TorvaldsNext: Drew Northup
Message 2 of 12 in “Dangerous "git am --abort" behavior”
  1. Linus TorvaldsDec 20, 2010
  2. Adam MonsenDec 20, 2010
  3. Drew NorthupDec 20, 2010
  4. Adam MonsenDec 20, 2010
  5. Steven E. HarrisDec 23, 2010
  6. Junio C HamanoDec 23, 2010
  7. Steven E. HarrisDec 24, 2010
  8. Junio C HamanoDec 21, 2010
  9. Junio C HamanoDec 21, 2010
  10. Linus TorvaldsDec 21, 2010
  11. Junio C HamanoDec 21, 2010
  12. Peter KreftingDec 22, 2010

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.