From df13b8348008510b2f3fd9be3696219078efe8d8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 30 Sep 2007 08:11:18 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.3.3-126-g72dc --- man1/git-rebase.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index 01829dc27..1820b16c0 100644 --- a/man1/git-rebase.1 +++ b/man1/git-rebase.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-REBASE" "1" "09/10/2007" "Git 1.5.3.1.27.g57543" "Git Manual" +.TH "GIT\-REBASE" "1" "09/30/2007" "Git 1.5.3.3.126.g72dc" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -279,7 +279,7 @@ The oneline descriptions are purely for your pleasure; git\-rebase will not look By replacing the command "pick" with the command "edit", you can tell git\-rebase to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue 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. +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. 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. -- 2.26.2