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

Re: [BUG] "git am" gets confused when commit message contains text looking like a diff

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 20, 2022, 21:35 UTC
Message-ID
<xmqqleriha2z.fsf@gitster.g>
In-Reply-To
<16297305.cDA1TJNmNo@earendil>
Thorsten Otto <admin@tho-otto.de> writes:
> Apparently git tries to apply the diff from the git commit message, instead of 
> the real diff.

This is very much expected, and that is why people indent diffs they quote to support their commit log messages.

Previous: Thorsten Otto
Message 2 of 2 in “[BUG] "git am" gets confused when commit message contains text looking like a diff”
  1. Thorsten OttoAug 20, 2022
  2. Junio C HamanoAug 20, 2022

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.