diff mbox series

[v4,4/9] apply docs: de-duplicate configuration sections

Message ID patch-v4-4.9-5523095fe7e-20220907T082419Z-avarab@gmail.com (mailing list archive)
State Accepted
Commit 416fed246ffaed4cafb9c35e38d1402704a377be
Headers show
Series docs: de-duplicate sections, add more CONFIGURATION sections | expand

Commit Message

Ævar Arnfjörð Bjarmason Sept. 7, 2022, 8:27 a.m. UTC
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>
---
 Documentation/git-apply.txt | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index b6d77f42068..1d478cbe9b5 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
 ----------