diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:55 (GMT) |
| commit | 5f8c70a14836c730c78533e35401db8269a96aa2 (patch) | |
| tree | 05f23b5e5601d70987193ec29d8f79c8de935ec7 /Documentation | |
| parent | 7da656f1e083b065400c4ab92405c6332481eb7a (diff) | |
| parent | 7efba5fa39fa1608fccea51a849b36b0f85825bb (diff) | |
| download | git-5f8c70a14836c730c78533e35401db8269a96aa2.zip git-5f8c70a14836c730c78533e35401db8269a96aa2.tar.gz git-5f8c70a14836c730c78533e35401db8269a96aa2.tar.bz2 | |
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.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt index 564e809..c2efd87 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 |