From d41d6d099f367a8602959a419e485658e8724996 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 30 Sep 2007 08:11:15 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.3-126-g72dc --- git-rebase.html | 4 ++-- git-rebase.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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.

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 the loop with git rebase --continue.

@@ -810,7 +810,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

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 -- 2.26.2