diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 15:00:05 -0700 |
| commit | 92d80370646a0ce43b0c769027492b3c891090aa (patch) | |
| tree | cee7315334fee3145cb4badcc7a400e3e763fbac /git-am.html | |
| parent | 48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff) | |
| download | git-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz | |
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-am.html b/git-am.html index 2098f92e3..a3581c9f3 100644 --- a/git-am.html +++ b/git-am.html @@ -1112,7 +1112,7 @@ aborts in the middle. You can recover from this in one of two ways:</p></div> <div class="olist arabic"><ol class="arabic">
<li>
<p>
-skip the current patch by re-running the command with the <em>--skip</em>
+skip the current patch by re-running the command with the <code>--skip</code>
option.
</p>
</li>
@@ -1120,7 +1120,7 @@ skip the current patch by re-running the command with the <em>--skip</em> <p>
hand resolve the conflict in the working directory, and update
the index file to bring it into a state that the patch should
- have produced. Then run the command with the <em>--continue</em> option.
+ have produced. Then run the command with the <code>--continue</code> option.
</p>
</li>
</ol></div>
@@ -1159,7 +1159,7 @@ information.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-07-06 14:33:48 PDT
+Last updated 2016-07-13 14:58:50 PDT
</div>
</div>
</body>
|