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

[PATCH] doc: am --show-current-patch gives an entire e-mail message

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 23, 2019, 06:09 UTC
Message-ID
<xmqqwocwgfgr.fsf@gitster-ct.c.googlers.com>

The existing wording gives an impression that it only gives the contents of the $GIT_DIR/rebase-apply/patch file, i.e. the patch proper, but the option actually emits the entire e-mail message being processed (iow, one of the output files from "git mailsplit").

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/git-am.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index fc3b993c33..fc5750b3b8 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -177,7 +177,7 @@ default.   You can use `--no-utf8` to override this.
 	untouched.
 
 --show-current-patch::
-	Show the patch being applied when "git am" is stopped because
+	Show the entire e-mail message "git am" has stopped at, because
 	of conflicts.
 
 DISCUSSION
-- 
2.24.0-rc0-248-ga4c21000fb
Message 1 of 1 in “doc: am --show-current-patch gives an entire e-mail message”
  1. doc: am --show-current-patch gives an entire e-mail messageJunio C Hamano, Oct 23, 2019

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.