diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-11-11 13:33:46 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-11-11 13:33:46 +0900 |
commit | 8ac8a3d8dd001611b77776fa19ef37c2c87cd987 (patch) | |
tree | efa3af5ebd3192b611732553c90c2d9baaa1e398 /git-am.txt | |
parent | 79d41dbe0b2fcbbc1cd5f6c188073a0956174289 (diff) | |
download | git-htmldocs-8ac8a3d8dd001611b77776fa19ef37c2c87cd987.tar.gz |
Autogenerated HTML docs for v2.24.0-155-gd9f6f
Diffstat (limited to 'git-am.txt')
-rw-r--r-- | git-am.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt index fc3b993c3..fc5750b3b 100644 --- a/git-am.txt +++ b/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 |