From: Marc Branchaud Date: Tue, 19 Jan 2021 14:37:48 GMT Subject: Re: [PATCH v2 9/9] doc/git-rebase: add documentation for fixup [-C|-c] options Message-ID: <8fd2b72c-d1d0-98be-e6a5-fb7dc699d5d5@xiplink.com> In-Reply-To: <20210119074102.21598-10-charvi077@gmail.com> Hi! On 2021-01-19 2:41 a.m., Charvi Mendiratta wrote: > Mentored-by: Christian Couder > Mentored-by: Phillip Wood > Signed-off-by: Charvi Mendiratta > --- > Documentation/git-rebase.txt | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index a0487b5cc5..776507e0cc 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -887,9 +887,15 @@ If you want to fold two or more commits into one, replace the command > "pick" for the second and subsequent commits with "squash" or "fixup". > If the commits had different authors, the folded commit will be > attributed to the author of the first commit. The suggested commit > -message for the folded commit is the concatenation of the commit > -messages of the first commit and of those with the "squash" command, > -but omits the commit messages of commits with the "fixup" command. > +message for the folded commit is created as follows: > + > + - It is made using the commit message of a commit with the "fixup -C" > + or "fixup -c" command. In the later case an editor is opened to edit > + the commit message. s/later/latter/ What happens if there is more than one "fixup -C/-c" command? Thanks for this work! M. > + - Otherwise it's the concatenation of the commit messages of the first > + commit and of those with the "squash" command. > + - It omits the commit messages of commits with the "fixup" > + (without -C or -c) command. > > 'git rebase' will stop when "pick" has been replaced with "edit" or > when a command fails due to merge errors. When you are done editing >