From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Apr 2026 20:01:08 +0000 (-0700)
Subject: Merge branch 'mf/format-patch-cover-letter-format'
X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=63901789bc05e51437442c9283e3716bfadb5b1c;p=rit

Merge branch 'mf/format-patch-cover-letter-format'

"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.

* mf/format-patch-cover-letter-format:
  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
---

63901789bc05e51437442c9283e3716bfadb5b1c
diff --cc builtin/log.c
index 89e8b8f011,5fec0ddaf9..716ebc2701
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -1341,9 -1386,10 +1397,10 @@@ static void make_cover_letter(struct re
  			      const char *description_file,
  			      const char *branch_name,
  			      int quiet,
- 			      const struct format_config *cfg)
+ 			      const struct format_config *cfg,
+ 			      const char *format)
  {
 -	const char *committer;
 +	const char *from;
  	struct shortlog log;
  	struct strbuf sb = STRBUF_INIT;
  	int i;