aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/config
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-02-17 15:33:37 -0800
committerJunio C Hamano <gitster@pobox.com>2023-02-17 15:43:09 -0800
commit50bebf98d96a6ccf2ca5c76da5dd8afff6933a4c (patch)
tree3c5b3e93f843a32c2eff9cccce393cc0267b56ef /Documentation/config
parentd9d677b2d8cc5f70499db04e633ba7a400f64cbf (diff)
downloadgit-50bebf98d96a6ccf2ca5c76da5dd8afff6933a4c.tar.gz
format.attach: allow empty value to disable multi-part messages
When a lower precedence configuration file (e.g. /etc/gitconfig) defines format.attach in any way, there was no way to disable it in a more specific configuration file (e.g. $HOME/.gitconfig). Change the behaviour of setting it to an empty string. It used to mean that the result is still a multipart message with only dashes used as a multi-part separator, but now it resets the setting to the default (which would be to give an inline patch, unless other command line options are in effect). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/format.txt3
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.