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

give a hint/solution for "It looks like git-am is in progress. Cannot rebase."

From
LGLucian Adrian Grijincu <lucian.grijincu@gmail.com>
Date
Aug 10, 2009, 14:34 UTC
Message-ID
<acf3f2e60908100734l6388d9a8k90ed835304a69918@mail.gmail.com>
Hi,

I ran git-am instead of git-apply on my repo. The git-am complained about the input data, I completely ignored it because I never use git-am (except on typos + tab-completions like today).

Later, after a few commits I wanted to rebase (interactively) my tree
to merge a few commits.
  $ git rebase -i HEAD~4
  It looks like git-am is in progress. Cannot rebase.

Ok, the message is nice, it tells me it can't do something, but I'm stupid enough not to know how to proceed. I see that this message is the same in HEAD (master and next).

It would be nice if git would output one or two hints. For example:
* run "git cancel-a-git-am-in-progress" to cancel a git-am in progress
* run "git commit-the-git-am-in-progress" to commit the git-am in progress

Of course, the commands need to be replaced with some valid git commands, but I don't know which those commands are :)

The message is generated in git-rebase.sh by this code:
  test -f "$GIT_DIR"/rebase-apply/applying &&
  die 'It looks like git-am is in progress. Cannot rebase.'

For now I think I'll `rm -rf .git/rebase-apply` (and hopefully not break anything).

-- 
 .
..: Lucian
Next: John Tapsell
Message 1 of 2 in “give a hint/solution for "It looks like git-am is in progress. Cannot rebase."”
  1. Lucian Adrian GrijincuAug 10, 2009
  2. John TapsellAug 10, 2009

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.