From: Ævar Arnfjörð Bjarmason Date: Wed, 7 Sep 2022 08:27:00 +0000 (+0200) Subject: apply docs: de-duplicate configuration sections X-Git-Tag: v2.38.0-rc0~8^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=416fed246ffaed4cafb9c35e38d1402704a377be;p=thirdparty%2Fgit.git apply docs: de-duplicate configuration sections The wording is not identical to Documentation/config/apply.txt, but that version is better. Signed-off-by: Ævar Arnfjörð Bjarmason Reviewed-by: Matheus Tavares Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index b6d77f4206..1d478cbe9b 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -263,13 +263,9 @@ has no effect when `--index` or `--cached` is in use. CONFIGURATION ------------- -apply.ignoreWhitespace:: - Set to 'change' if you want changes in whitespace to be ignored by default. - Set to one of: no, none, never, false if you want changes in - whitespace to be significant. -apply.whitespace:: - When no `--whitespace` flag is given from the command - line, this configuration item is used as the default. +include::includes/cmd-config-section-all.txt[] + +include::config/apply.txt[] SUBMODULES ----------