Autogenerated HTML docs for v1.8.3.2-701-g8c4e4ec

1 files changed, 3 insertions, 3 deletions

diff --git a/git-am.html b/git-am.html
index e4fff695f..55e51ff1d 100644
--- a/git-am.html
+++ b/git-am.html
@@ -1000,7 +1000,7 @@ default.   You can use <code>--no-utf8</code> to override this.</p></div>
 <p>

         When a patch failure occurs, &lt;msg&gt; will be printed

         to the screen before exiting.  This overrides the

-        standard message informing you to use <code>--resolved</code>

+        standard message informing you to use <code>--continue</code>

         or <code>--skip</code> to handle the failure.  This is solely

         for internal use between <em>git rebase</em> and <em>git am</em>.

 </p>

@@ -1066,7 +1066,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>--resolved</em> option.

+  have produced.  Then run the command with the <em>--continue</em> option.

 </p>

 </li>

 </ol></div>

@@ -1097,7 +1097,7 @@ errors in the "From:" lines).</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2013-05-17 16:33:07 PDT

+Last updated 2013-07-01 14:29:27 PDT

 </div>

 </div>

 </body>