| Message ID | patch-v2-4.9-b9750ae43e1-20220729T081959Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 416fed246ffaed4cafb9c35e38d1402704a377be |
| Headers | show |
| Series | docs: de-duplicate sections, add more CONFIGURATION sections | expand |
On Fri, Jul 29, 2022 at 5:26 AM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote: > > The wording is not identical to Documentation/config/apply.txt, but > that version is better. Yeah, I agree. The only potential "loss" of information here is that "apply.whitespace is the default when the cli arg is not used". But that is the default for all configurations anyways.
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 ----------
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(-)