summaryrefslogtreecommitdiff
path: root/Documentation/config/format.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/config/format.txt')
-rw-r--r--Documentation/config/format.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index 45c7bd5a8f..c2efd8758a 100644
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -57,6 +57,11 @@ format.suffix::
`.patch`. Use this variable to change that suffix (make sure to
include the dot if you want it).
+format.encodeEmailHeaders::
+ Encode email headers that have non-ASCII characters with
+ "Q-encoding" (described in RFC 2047) for email transmission.
+ Defaults to true.
+
format.pretty::
The default pretty format for log/show/whatchanged command,
See linkgit:git-log[1], linkgit:git-show[1],
@@ -91,7 +96,9 @@ format.outputDirectory::
format.useAutoBase::
A boolean value which lets you enable the `--base=auto` option of
- format-patch by default.
+ format-patch by default. Can also be set to "whenAble" to allow
+ enabling `--base=auto` if a suitable base is available, but to skip
+ adding base info otherwise without the format dying.
format.notes::
Provides the default value for the `--notes` option to