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.html | |
| parent | 79d41dbe0b2fcbbc1cd5f6c188073a0956174289 (diff) | |
| download | git-htmldocs-8ac8a3d8dd001611b77776fa19ef37c2c87cd987.tar.gz | |
Autogenerated HTML docs for v2.24.0-155-gd9f6f
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.html b/git-am.html index aa87ba397..d2bc2a68b 100644 --- a/git-am.html +++ b/git-am.html @@ -1094,7 +1094,7 @@ default. You can use <code>--no-utf8</code> to override this.</p></div> </dt>
<dd>
<p>
- 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.
</p>
</dd>
@@ -1191,7 +1191,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2019-04-16 21:48:13 JST
+ 2019-11-11 13:29:13 JST
</div>
</div>
</body>
|