diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-11-10 09:02:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 09:02:14 (GMT) |
| commit | f1e2666b332161c96b13c692c96ae39f0aa55612 (patch) | |
| tree | df5c443c626855255f3a862267a4bf1ce8e1ebfb | |
| parent | 8f1119b988199dd69473c8ac4f9cafa27bff1e52 (diff) | |
| parent | 80736d7c5eabe49062aeaea47b83eba2bb40314d (diff) | |
| download | git-f1e2666b332161c96b13c692c96ae39f0aa55612.zip git-f1e2666b332161c96b13c692c96ae39f0aa55612.tar.gz git-f1e2666b332161c96b13c692c96ae39f0aa55612.tar.bz2 | |
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
| -rw-r--r-- | Documentation/git-am.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index fc3b993..fc5750b 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 |