Re: [PATCH v2 9/9] doc/git-rebase: add documentation for fixup [-C|-c] options

From: Charvi Mendiratta <charvi077@gmail.com>
Date: Jan 20, 2021, 07:10 UTC
Message-ID: <CAPSFM5e8pKQ-HLuhONsChrkLb7Q6LxV7YbrF0RJx6TKOOy=rJQ@mail.gmail.com>
In-Reply-To: <a9bc4d25-f2ec-6a8f-4969-7704f12d667b@xiplink.com>

On Wed, 20 Jan 2021 at 03:35, Marc Branchaud <marcnarc@xiplink.com> wrote:

[...]

> I'm also under the impression that the "fixup -C/-c" commit's patch is
> still incorporated into the folded commit.  Is that right?
>

yes, it's still incorporated into the folded commit, as it just adds options to the `fixup` command to replace or edit the commit message.

Show 15 quoted lines

> So I think the documentation could be improved.  Assuming that a "fixup
> -C/-c" commit's patch is incorporated just like with plain "fixup",
> something like:
>
> The suggested commit message for the folded commit is the concatenation
> of the first commit's message with those identified by "squash"
> commands, omitting the messages of commits identified by "fixup"
> commands, `unless` "fixup -c" is used.  In that case the suggested
> commit message is `only` the message of the "fixup -c" commit, and an
> editor is opened allowing you to edit the message.  The contents (patch)
> of the "fixup -c" commit are still incorporated into the folded commit.
>   If there is more than one "fixup -c" commit, the message from the last
> last one is used.  You can also use "fixup -C" to get the same behavior
> as "fixup -c" except without opening an editor.
>

I agree, this is now more clear and explains for more than one `fixup [-C|-c]` or `squash` command also. Thanks for the suggestions, I will change this in the next revision.

Thanks and Regards, Charvi