From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Mar 2026 19:42:54 +0000 (-0700)
Subject: Merge branch 'mf/format-patch-cover-letter-format' into mf/format-patch-commit-list... 
X-Git-Tag: v2.54.0-rc1~36^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3c222ed9103db7947b432a99d460e22bdc873ca;p=thirdparty%2Fgit.git

Merge branch 'mf/format-patch-cover-letter-format' into mf/format-patch-commit-list-format

* 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
---

b3c222ed9103db7947b432a99d460e22bdc873ca
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;