threads / patch / 52098

patchdoc: am --show-current-patch gives an entire e-mail message

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

## tl;dr

One message between Oct 23, 2019 and Oct 23, 2019. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Junio C Hamano· Oct 23, 2019, 06:09 UTC · lore

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(-)
Show changes to Documentation/git-am.txt +1 −1
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

← back to recent threads