Autogenerated HTML docs for v1.5.3.3-126-g72dc

diff --git a/git-rebase.html b/git-rebase.html
index 362b931a0ac456d614f83f839e688f5b00b8cdbb..09f87b8eb51d9afeed5346635f4e04390916e5be 100644 (file)
--- 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\r
 "pick" with "squash" for the second and subsequent commit.  If the\r
 commits had different authors, it will attribute the squashed commit to\r
-the author of the last commit.</p>\r
+the author of the first commit.</p>\r
 <p>In both cases, or when a "pick" does not succeed (because of merge\r
 errors), the loop will stop to let you fix things, and you can continue\r
 the loop with <tt>git rebase --continue</tt>.</p>\r
@@ -810,7 +810,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Sep-2007 01:32:39 UTC\r
+Last updated 30-Sep-2007 08:10:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.txt b/git-rebase.txt
index 0858fa8a6326a0c457bc9b4bb63ae35d3001ef65..e8e75790fc21b403f428b8cca72ab42a072e1b38 100644 (file)
--- 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