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

Re: git-am doesn't apply the rest of the email after a partial patch fail?

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 9, 2013, 18:57 UTC
Message-ID
<7v1uajsfaf.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAPKkNb6tbGtcpiYGpj6mSPnp_-aXO=HTvAjOEKJ1f-cgPOHBDA@mail.gmail.com>
"Constantine A. Murenin" <mureninc@gmail.com> writes:
> Well, I now know this, but it wasn't clear from the documentation that
> that was the behaviour.

Yes, the message "after you _resolved_, please tell me you are now done" is too fuzzy. What it wants to say is:

	I punted, because the patch does not apply, and it is stored
	here.  Update the index to hold contents that the sender of
	the patch would have liked to see if the patch were to apply
	cleanly.  Tell me when you are done, with "am --resolved".
	Then I'll commit that content in the index for you with the
	authorship and log message I learned from the e-mail and
	continue.
Previous: Constantine A. Murenin
Message 5 of 5 in “git-am doesn't apply the rest of the email after a partial patch fail?”
  1. Constantine A. MureninApr 7, 2013
  2. Constantine A. MureninApr 7, 2013
  3. Junio C HamanoApr 8, 2013
  4. Constantine A. MureninApr 9, 2013
  5. Junio C HamanoApr 9, 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.