From: Junio C Hamano <junio@hera.kernel.org>
Date: Sun, 30 Sep 2007 08:11:15 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.3.3-126-g72dc
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d41d6d099f367a8602959a419e485658e8724996;p=git.git

Autogenerated HTML docs for v1.5.3.3-126-g72dc
---

diff --git a/git-rebase.html b/git-rebase.html
index 362b931a0..09f87b8eb 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -712,7 +712,7 @@ rebasing.</p>
 <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 last commit.</p>
+the author of the first commit.</p>
 <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>
@@ -810,7 +810,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 10-Sep-2007 01:32:39 UTC
+Last updated 30-Sep-2007 08:10:55 UTC
 </div>
 </div>
 </body>
diff --git a/git-rebase.txt b/git-rebase.txt
index 0858fa8a6..e8e75790f 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -298,7 +298,7 @@ rebasing.
 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 last commit.
+the author of the first commit.
 
 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