diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-09 12:02:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-09 12:02:25 -0700 |
| commit | 0e2a4764edea38c4aad95af246d6a7648a7d5e2d (patch) | |
| tree | 01f278caec2b8d7d037abeb37f34968d484d5d97 /Documentation | |
| parent | 428dce9f4d70b44b61c19c36f3dbe5b3f58aeba2 (diff) | |
| parent | d5fc07df688ace8c5a32f66b358ebd55cdaf4d28 (diff) | |
| download | git-0e2a4764edea38c4aad95af246d6a7648a7d5e2d.tar.xz | |
Merge branch 'jc/format-patch-force-in-body-from'
"git format-patch --from=<ident>" can be told to add an in-body
"From:" line even for commits that are authored by the given
<ident> with "--force-in-body-from"option.
* jc/format-patch-force-in-body-from:
format-patch: learn format.forceInBodyFrom configuration variable
format-patch: allow forcing the use of in-body From: header
pretty: separate out the logic to decide the use of in-body from
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/format.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-format-patch.txt | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt index fdbc06a4d2..c7303d8d9f 100644 --- a/Documentation/config/format.txt +++ b/Documentation/config/format.txt @@ -15,6 +15,10 @@ format.from:: different. If set to a non-boolean value, format-patch uses that value instead of your committer identity. Defaults to false. +format.forceInBodyFrom:: + Provides the default value for the `--[no-]force-in-body-from` + option to format-patch. Defaults to false. + format.numbered:: A boolean which can enable or disable sequence numbers in patch subjects. It defaults to "auto" which enables it only if there diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index be797d7a28..dfcc7da4c2 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -275,6 +275,17 @@ header). Note also that `git send-email` already handles this transformation for you, and this option should not be used if you are feeding the result to `git send-email`. +--[no-]force-in-body-from:: + With the e-mail sender specified via the `--from` option, by + default, an in-body "From:" to identify the real author of + the commit is added at the top of the commit log message if + the sender is different from the author. With this option, + the in-body "From:" is added even when the sender and the + author have the same name and address, which may help if the + mailing list software mangles the sender's identity. + Defaults to the value of the `format.forceInBodyFrom` + configuration variable. + --add-header=<header>:: Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. |