git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Charvi Mendiratta <charvi077@gmail.com>
Date
Feb 19, 2021, 06:14 UTC
Message-ID
<CAPSFM5caUz-tz3AAAgXeOB26CZ87A0xdG3aHYHTgCC9d8zsbKw@mail.gmail.com>
In-Reply-To
<xmqq8s7lf9ra.fsf@gitster.g>
On Fri, 19 Feb 2021 at 01:07, Junio C Hamano <gitster@pobox.com> wrote:
Show 37 quoted lines
>
> Charvi Mendiratta <charvi077@gmail.com> writes:
>
> > 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.
>
Yes, this explains as per the working and sounds good to me.

Thanks and Regards, Charvi

Previous: Junio C Hamano
Message 8 of 8 in “What's cooking in git.git (Feb 2021, #03; Wed, 17)”
  1. Junio C HamanoFeb 18, 2021
  2. Matheus Tavares BernardinoFeb 18, 2021
  3. Junio C HamanoFeb 18, 2021
  4. Martin ÅgrenFeb 18, 2021
  5. Junio C HamanoFeb 18, 2021
  6. Charvi MendirattaFeb 18, 2021
  7. Junio C HamanoFeb 18, 2021
  8. Charvi MendirattaFeb 19, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.