diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-27 21:08:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-27 21:08:57 +0300 |
| commit | 630501ceef6a70203f89ab62c9909c96a2d751ec (patch) | |
| tree | 3c5c2719dbb9958b37c12ffd98aa368dbc73c1e2 /Documentation | |
| parent | dda83e69d08ce37c64157007e050a142660fd15c (diff) | |
| parent | 50bebf98d96a6ccf2ca5c76da5dd8afff6933a4c (diff) | |
Merge branch 'jc/countermand-format-attach'
The format.attach configuration variable lacked a way to override a
value defined in a lower-priority configuration file (e.g. the
system one) by redefining it in a higher-priority configuration
file. Now, setting format.attach to an empty string means show the
patch inline in the e-mail message, without using MIME attachment.
This is a backward incompatible change.
* jc/countermand-format-attach:
format.attach: allow empty value to disable multi-part messages
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/format.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt index 3bd78269e2..73678d88a1 100644 --- a/Documentation/config/format.txt +++ b/Documentation/config/format.txt @@ -3,7 +3,8 @@ format.attach:: 'format-patch'. The value can also be a double quoted string which will enable attachments as the default and set the value as the boundary. See the --attach option in - linkgit:git-format-patch[1]. + linkgit:git-format-patch[1]. To countermand an earlier + value, set it to an empty string. format.from:: Provides the default value for the `--from` option to format-patch. |