Merge branch 'jc/am-show-current-patch-docfix'

Doc update. * jc/am-show-current-patch-docfix: doc: am --show-current-patch gives an entire e-mail message
5 years ago · f1e2666b33
1 changed files with 1 additions and 1 deletions
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@ -177,7 +177,7 @@ default.   You can use `--no-utf8` to override this.
				@@ -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