From: Mirko Faina <mroik@delayed.space>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Mar 2026, #12)
Date: Tue, 31 Mar 2026 02:20:41 +0200 [thread overview]
Message-ID: <acsRsp_dy1_Cd5Qp@exploit> (raw)
In-Reply-To: <xmqqcy0k6epp.fsf@gitster.g>
On Mon, Mar 30, 2026 at 05:10:42PM -0700, Junio C Hamano wrote:
> * mf/format-patch-commit-list-format-doc (2026-03-27) 3 commits
> - format-patch: removing unconditional wrapping
> - docs: fix --commit-list-format related entries
> - Merge branch 'mf/format-patch-commit-list-format' into mf/format-patch-commit-list-format-doc
> (this branch uses mf/format-patch-commit-list-format and mf/format-patch-cover-letter-format.)
>
> Doc updates.
>
> Will merge to 'next'.
> source: <cover.1774640789.git.mroik@delayed.space>
>
> [...]
>
> * mf/format-patch-commit-list-format (2026-03-23) 9 commits
> (merged to 'next' on 2026-03-24 at 0f5b6702eb)
> + format-patch: --commit-list-format without prefix
> + format-patch: add preset for --commit-list-format
> + format-patch: wrap generate_commit_list_cover()
> + format.commitListFormat: strip meaning from empty
> + docs/pretty-formats: add %(count) and %(total)
> + format-patch: rename --cover-letter-format option
> + format-patch: refactor generate_commit_list_cover
> + pretty.c: better die message %(count) and %(total)
> + Merge branch 'mf/format-patch-cover-letter-format' into mf/format-patch-commit-list-format
> (this branch is used by mf/format-patch-commit-list-format-doc; uses mf/format-patch-cover-letter-format.)
>
> Improve the recently introduced `git format-patch
> --commit-list-format` (formerly `--cover-letter-format`) option,
> including a new "modern" preset and better CLI ergonomics.
>
> Will merge to 'master'.
> source: <cover.1774284699.git.mroik@delayed.space>
>
> [...]
>
> * mf/format-patch-cover-letter-format (2026-03-06) 5 commits
> (merged to 'next' on 2026-03-09 at e872adca7b)
> + docs: add usage for the cover-letter fmt feature
> + format-patch: add commitListFormat config
> + format-patch: add ability to use alt cover format
> + format-patch: move cover letter summary generation
> + pretty.c: add %(count) and %(total) placeholders
> (this branch is used by mf/format-patch-commit-list-format and mf/format-patch-commit-list-format-doc.)
>
> "git format-patch --cover-letter" learns to use a simpler format
> instead of the traditional shortlog format to list its commits with
> a new --cover-letter-format option and format.commitListFormat
> configuration variable.
>
> Waiting for the follow-on topic.
> source: <cover.1772839973.git.mroik@delayed.space>
Hi, not sure how it works with incremental topics. Does this mean that
you won't merge mf/format-patch-cover-letter-format because it will be
merged anyway with mf/format-patch-commit-list-format? Does that mean
that you'll merge twice, once for mf/format-patch-commit-list-format and
a second time for mf/format-patch-commit-list-format-doc?
If that's the case I think you should not merge in
mf/format-patch-commit-list-format and wait for everything to be merged
with mf/format-patch-commit-list-format-doc. The latter is not just a
doc update, without it format-patch enforces the 72 character limit on
the commit list, not sure we want that in master.
Thank you
next prev parent reply other threads:[~2026-03-31 0:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-31 0:10 What's cooking in git.git (Mar 2026, #12) Junio C Hamano
2026-03-31 0:20 ` Mirko Faina [this message]
2026-03-31 15:15 ` Junio C Hamano
2026-03-31 5:22 ` Patrick Steinhardt
2026-03-31 15:27 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=acsRsp_dy1_Cd5Qp@exploit \
--to=mroik@delayed.space \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox