Autogenerated HTML docs for v1.6.5.1-61-ge79999

1 files changed, 6 insertions, 4 deletions

diff --git a/git-rebase.html b/git-rebase.html
index e4a9baccf..6cd9ff645 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -900,13 +900,15 @@ example), so do not delete or edit the names.</p></div>
 <em>git-rebase</em> to stop after applying that commit, so that you can edit

 the files and/or the commit message, amend the commit, and continue

 rebasing.</p></div>

+<div class="para"><p>If you just want to edit the commit message for a commit, replace the

+command "pick" with the command "reword".</p></div>

 <div class="para"><p>If you want to fold two or more commits into one, replace the command

 "pick" with "squash" for the second and subsequent commit.  If the

 commits had different authors, it will attribute the squashed commit to

 the author of the first commit.</p></div>

-<div class="para"><p>In both cases, or when a "pick" does not succeed (because of merge

-errors), the loop will stop to let you fix things, and you can continue

-the loop with <tt>git rebase --continue</tt>.</p></div>

+<div class="para"><p><em>git-rebase</em> will stop when "pick" has been replaced with "edit" or

+when a command fails due to merge errors. When you are done editing

+and/or resolving conflicts you can continue with <tt>git rebase --continue</tt>.</p></div>

 <div class="para"><p>For example, if you want to reorder the last 5 commits, such that what

 was HEAD~4 becomes the new HEAD. To achieve that, you would call

 <em>git-rebase</em> like this:</p></div>

@@ -1130,7 +1132,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-08-22 05:10:26 UTC

+Last updated 2009-10-19 08:04:10 UTC

 </div>

 </div>

 </body>