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

* 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

diff --cc Documentation/git-format-patch.adoc
Simple merge

diff --cc builtin/log.c
index 89e8b8f01156656afc620dbf92cd4b6bd9ad916c,5fec0ddaf91b0a52c4dac9a1a334019eeff3e1d2..716ebc2701e4956e4009dba339e874e25d9aca85
--- 1/builtin/log.c
--- 2/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;

diff --cc pretty.c
Simple merge

diff --cc t/t4014-format-patch.sh
Simple merge

diff --cc t/t9902-completion.sh
Simple merge