summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-10-05 14:01:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-05 14:01:55 -0700
commit5f8c70a14836c730c78533e35401db8269a96aa2 (patch)
tree05f23b5e5601d70987193ec29d8f79c8de935ec7 /Documentation
parentMerge branch 'jk/diff-cc-oidfind-fix' (diff)
parentformat-patch: teach format.useAutoBase "whenAble" option (diff)
downloadtgif-5f8c70a14836c730c78533e35401db8269a96aa2.tar.xz
Merge branch 'jk/format-auto-base-when-able'
"git format-patch" learns to take "whenAble" as a possible value for the format.useAutoBase configuration variable to become no-op when the automatically computed base does not make sense. * jk/format-auto-base-when-able: format-patch: teach format.useAutoBase "whenAble" option
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config/format.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index 564e8091ba..c2efd8758a 100644
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -96,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