]> git.ipfire.org Git - thirdparty/git.git/commitdiff
apply docs: de-duplicate configuration sections
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Wed, 7 Sep 2022 08:27:00 +0000 (10:27 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Sep 2022 16:46:05 +0000 (09:46 -0700)
The wording is not identical to Documentation/config/apply.txt, but
that version is better.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-apply.txt

index b6d77f420682618be63cb27a34e803cfcac8f802..1d478cbe9b5b873566fd9fc34e5d837bd0a4595c 100644 (file)
@@ -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
 ----------