Autogenerated HTML docs for v1.6.0-rc0-14-g95f8

1 files changed, 4 insertions, 4 deletions

diff --git a/git-am.html b/git-am.html
index f06361895..474d025d4 100644
--- a/git-am.html
+++ b/git-am.html
@@ -557,9 +557,9 @@ hand resolve the conflict in the working directory, and update
 </p>

 </li>

 </ol></div>

-<div class="para"><p>The command refuses to process new mailboxes while <tt>.git/rebase</tt>

+<div class="para"><p>The command refuses to process new mailboxes while <tt>.git/rebase-apply</tt>

 directory exists, so if you decide to start over from scratch,

-run <tt>rm -f -r .git/rebase</tt> before running the command with mailbox

+run <tt>rm -f -r .git/rebase-apply</tt> before running the command with mailbox

 names.</p></div>

 <div class="para"><p>Before any patches are applied, ORIG_HEAD is set to the tip of the

 current branch.  This is useful if you have problems with multiple

@@ -573,7 +573,7 @@ errors in the "From:" lines).</p></div>
 </div>

 <h2 id="_author">Author</h2>

 <div class="sectionbody">

-<div class="para"><p>Written by Junio C Hamano &lt;junkio@cox.net&gt;</p></div>

+<div class="para"><p>Written by Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>

 </div>

 <h2 id="_documentation">Documentation</h2>

 <div class="sectionbody">

@@ -585,7 +585,7 @@ errors in the "From:" lines).</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-07-21 04:33:30 UTC

+Last updated 2008-07-22 09:19:03 UTC

 </div>

 </div>

 </body>