Skip to content

Commit 416fed2

Browse files
avargitster
authored andcommitted
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 <[email protected]> Reviewed-by: Matheus Tavares <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent bac1d52 commit 416fed2

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

Documentation/git-apply.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,13 +263,9 @@ has no effect when `--index` or `--cached` is in use.
263263
CONFIGURATION
264264
-------------
265265

266-
apply.ignoreWhitespace::
267-
Set to 'change' if you want changes in whitespace to be ignored by default.
268-
Set to one of: no, none, never, false if you want changes in
269-
whitespace to be significant.
270-
apply.whitespace::
271-
When no `--whitespace` flag is given from the command
272-
line, this configuration item is used as the default.
266+
include::includes/cmd-config-section-all.txt[]
267+
268+
include::config/apply.txt[]
273269

274270
SUBMODULES
275271
----------

0 commit comments

Comments
 (0)