summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-06-13 13:19:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-13 13:19:42 -0700
commite91f65d0e28b9f4dce85f82c5e3e208a54171a14 (patch)
treea32d8e65d3ed94ea0dc7bbfddd21dba832e80253 /Documentation/config
parentMerge branch 'nd/merge-quit' (diff)
parentformat-patch: teach format.notes config option (diff)
downloadtgif-e91f65d0e28b9f4dce85f82c5e3e208a54171a14.tar.xz
Merge branch 'dl/format-patch-notes-config'
"git format-patch" learns a configuration to set the default for its --notes=<ref> option. * dl/format-patch-notes-config: format-patch: teach format.notes config option git-format-patch.txt: document --no-notes option
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/format.txt15
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index dc77941c48..414a5a8a9d 100644
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -85,3 +85,18 @@ format.outputDirectory::
format.useAutoBase::
A boolean value which lets you enable the `--base=auto` option of
format-patch by default.
+
+format.notes::
+ Provides the default value for the `--notes` option to
+ format-patch. Accepts a boolean value, or a ref which specifies
+ where to get notes. If false, format-patch defaults to
+ `--no-notes`. If true, format-patch defaults to `--notes`. If
+ set to a non-boolean value, format-patch defaults to
+ `--notes=<ref>`, where `ref` is the non-boolean value. Defaults
+ to false.
++
+If one wishes to use the ref `ref/notes/true`, please use that literal
+instead.
++
+This configuration can be specified multiple times in order to allow
+multiple notes refs to be included.