Re: What's cooking in git.git (Feb 2021, #03; Wed, 17)

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 18, 2021, 19:36 UTC
Message-ID: <xmqq8s7lf9ra.fsf@gitster.g>
In-Reply-To: <CAPSFM5efu6MF2RzfDkw8XJ9kF79akEesdA0WFAG3n9fo9N26vQ@mail.gmail.com>

Charvi Mendiratta <charvi077@gmail.com> writes:

Show 21 quoted lines

> On Thu, 18 Feb 2021 at 07:44, Junio C Hamano <gitster@pobox.com> wrote:
>>
>> * cm/rebase-i-fixup-amend-reword (2021-02-17) 6 commits
>>  - doc/git-commit: add documentation for fixup[amend|reword] options
>>  - t3437: use --fixup with options to create amend! commit
>>  - t7500: add tests for --fixup[amend|reword] options
>>  - commit: add a reword suboption to --fixup
>>  - commit: add amend suboption to --fixup to create amend! commit
>>  - sequencer: export subject_length()
>>  (this branch uses cm/rebase-i and cm/rebase-i-updates.)
>>
>>  "git commit --fixup" learns to optionally create "amend!" and
>>  "reword!"  commits, that use the log message in "fixup" commit
>>  as the message of the resulting commit.
>>
>
> I would like to put light on the description of the patches. I might have
> misinterpreted the meaning of  _"reword!" commit_ as written above.
> But I thought to explain that here both additional suboptions i.e
> `amend` and `reword`
> of `--fixup` introduced in the patch series creates "amend!" commit only.

Thanks for clarifying.  I did mix up in the description.

As the parameter given to the command line option is much more end-user facing than which insn it results in the todo list, how about explaining the topic like so:

    "git commit --fixup=<commit>", which was to tweak the changes
    made to the contents while keeping the original log message
    intact, learned "--fixup=(amend|reword):<commit>", that can be
    used to tweak both the message and the contents, and only the
    message, respectively.