diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2026-04-04 11:53:49 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2026-04-04 11:57:24 +0800 |
| commit | fc2a6741f71c71ddc7e1cc71c8f6289fcda2ff2d (patch) | |
| tree | baec3af2039bd59c01e049f3bd9e10e233d44a1d /Documentation/git-format-patch.adoc | |
| parent | 82747b07cc0f7d6fd8237633c1eb533050efba3d (diff) | |
| parent | 8de2f1b07a8053d7f1aad70dc1131d6afcf5a28a (diff) | |
| download | git-fc2a6741f71c71ddc7e1cc71c8f6289fcda2ff2d.tar.gz git-fc2a6741f71c71ddc7e1cc71c8f6289fcda2ff2d.zip | |
Merge branch 'master' of https://github.com/git/git
Upstream adds 18 new translatable messages.
* 'master' of https://github.com/git/git: (41 commits)
A bit more on top of 2.54-rc0
...
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Diffstat (limited to 'Documentation/git-format-patch.adoc')
| -rw-r--r-- | Documentation/git-format-patch.adoc | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/Documentation/git-format-patch.adoc b/Documentation/git-format-patch.adoc index 36146006fa..5662382450 100644 --- a/Documentation/git-format-patch.adoc +++ b/Documentation/git-format-patch.adoc @@ -24,6 +24,7 @@ SYNOPSIS [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] [--[no-]cover-letter] [--quiet] + [--commit-list-format=<format-spec>] [--[no-]encode-email-headers] [--no-notes | --notes[=<ref>]] [--interdiff=<previous>] @@ -318,9 +319,21 @@ feeding the result to `git send-email`. --cover-letter:: --no-cover-letter:: - In addition to the patches, generate a cover letter file - containing the branch description, shortlog and the overall diffstat. You can - fill in a description in the file before sending it out. + In addition to the patches, generate a cover letter file containing the + branch description, commit list and the overall diffstat. You can fill + in a description in the file before sending it out. + +--commit-list-format=<format-spec>:: + Specify the format in which to generate the commit list of the patch + series. The accepted values for format-spec are `shortlog`, `modern` or + a format-string prefixed with `log:`. E.g. `log: %s (%an)`. + `modern` is the same as `log:%w(72)[%(count)/%(total)] %s`. + The `log:` prefix can be omitted if the format-string has a `%` in it + (expecting that it is part of `%<placeholder>`). + Defaults to the `format.commitListFormat` configuration variable, if + set, or `shortlog`. + This option given from the command-line implies the use of + `--cover-letter` unless `--no-cover-letter` is given. --encode-email-headers:: --no-encode-email-headers:: @@ -453,6 +466,7 @@ with configuration variables. signOff = true outputDirectory = <directory> coverLetter = auto + commitListFormat = shortlog coverFromDescription = auto ------------ |