{"thread":{"id":"20520","subject":"give a hint/solution for \"It looks like git-am is in progress. Cannot rebase.\"","startedAt":"2009-08-10T14:34:04Z","lastAt":"2009-08-10T15:59:03Z","messageCount":2,"participants":["Lucian Adrian Grijincu","John Tapsell"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"120157","messageId":"acf3f2e60908100734l6388d9a8k90ed835304a69918@mail.gmail.com","threadId":"20520","inReplyTo":null,"subject":"give a hint/solution for \"It looks like git-am is in progress. Cannot rebase.\"","fromName":"Lucian Adrian Grijincu","fromEmail":"lucian.grijincu@gmail.com","sentAt":"2009-08-10T14:34:04Z","receivedAt":"2009-08-10T14:34:04Z","isPatch":false,"sender":{"key":"lucian.grijincu@gmail.com","avatar":null},"body":"Hi,\n\nI ran git-am instead of git-apply on my repo. The git-am complained\nabout the input data, I completely ignored it because I never use\ngit-am (except on typos + tab-completions like today).\n\nLater, after a few commits I wanted to rebase (interactively) my tree\nto merge a few commits.\n  $ git rebase -i HEAD~4\n  It looks like git-am is in progress. Cannot rebase.\n\nOk, the message is nice, it tells me it can't do something, but I'm\nstupid enough not to know how to proceed.\nI see that this message is the same in HEAD (master and next).\n\nIt would be nice if git would output one or two hints. For example:\n* run \"git cancel-a-git-am-in-progress\" to cancel a git-am in progress\n* run \"git commit-the-git-am-in-progress\" to commit the git-am in progress\n\nOf course, the commands need to be replaced with some valid git\ncommands, but I don't know which those commands are :)\n\nThe message is generated in git-rebase.sh by this code:\n  test -f \"$GIT_DIR\"/rebase-apply/applying &&\n  die 'It looks like git-am is in progress. Cannot rebase.'\n\nFor now I think I'll `rm -rf .git/rebase-apply` (and hopefully not\nbreak anything).\n\n-- \n .\n..: Lucian\n"},{"id":"120179","messageId":"43d8ce650908100859m50379376y410a67b69244f38a@mail.gmail.com","threadId":"20520","inReplyTo":"acf3f2e60908100734l6388d9a8k90ed835304a69918@mail.gmail.com","subject":"Re: give a hint/solution for \"It looks like git-am is in progress. Cannot rebase.\"","fromName":"John Tapsell","fromEmail":"johnflux@gmail.com","sentAt":"2009-08-10T15:59:03Z","receivedAt":"2009-08-10T15:59:03Z","isPatch":false,"sender":{"key":"johnflux@gmail.com","avatar":"https://gravatar.com/avatar/25f70d4c0f96396b84a2e34bcd9bdc233462c7b4be29b5fdca8266fc53f30b0c?d=mp&s=160"},"body":"2009/8/10 Lucian Adrian Grijincu <lucian.grijincu@gmail.com>:\n> Hi,\n>\n> I ran git-am instead of git-apply on my repo. The git-am complained\n> about the input data, I completely ignored it because I never use\n> git-am (except on typos + tab-completions like today).\n>\n> Later, after a few commits I wanted to rebase (interactively) my tree\n> to merge a few commits.\n>  $ git rebase -i HEAD~4\n>  It looks like git-am is in progress. Cannot rebase.\n>\n> Ok, the message is nice, it tells me it can't do something, but I'm\n> stupid enough not to know how to proceed.\n> I see that this message is the same in HEAD (master and next).\n>\n> It would be nice if git would output one or two hints. For example:\n> * run \"git cancel-a-git-am-in-progress\" to cancel a git-am in progress\n> * run \"git commit-the-git-am-in-progress\" to commit the git-am in progress\n\n+1\n\ngit am --help  suggests  --abort      btw.  That would be the most\nobvious guess :-)\n\n\n\n> Of course, the commands need to be replaced with some valid git\n> commands, but I don't know which those commands are :)\n>\n> The message is generated in git-rebase.sh by this code:\n>  test -f \"$GIT_DIR\"/rebase-apply/applying &&\n>  die 'It looks like git-am is in progress. Cannot rebase.'\n>\n> For now I think I'll `rm -rf .git/rebase-apply` (and hopefully not\n> break anything).\n>\n> --\n>  .\n> ..: Lucian\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n>\n"}]}