summaryrefslogtreecommitdiffstats
path: root/git-apply.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-09-14 13:25:23 -0700
committerJunio C Hamano <gitster@pobox.com>2022-09-14 13:25:23 -0700
commitba8baee8618696a4405a1c7feb93ce8d3b089795 (patch)
tree36a0a7f824df6259cd09b0081e297b366279ab46 /git-apply.html
parentb2e63923b4a1650cdd5c8d919dacf6c650940a92 (diff)
downloadgit-htmldocs-ba8baee8618696a4405a1c7feb93ce8d3b089795.tar.gz
Autogenerated HTML docs for v2.37.3-662-g36f8e7e
Diffstat (limited to 'git-apply.html')
-rw-r--r--git-apply.html18
1 files changed, 12 insertions, 6 deletions
diff --git a/git-apply.html b/git-apply.html
index d83172a4e..189a2673c 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -1187,15 +1187,21 @@ has no effect when <code>--index</code> or <code>--cached</code> is in use.</p><
<div class="sect1">
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
+<div class="paragraph"><p>Everything below this line in this section is selectively included
+from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
+as what&#8217;s found there:</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
apply.ignoreWhitespace
</dt>
<dd>
<p>
- Set to <em>change</em> 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.
+ When set to <em>change</em>, tells <em>git apply</em> to ignore changes in
+ whitespace, in the same way as the <code>--ignore-space-change</code>
+ option.
+ When set to one of: no, none, never, false tells <em>git apply</em> to
+ respect all whitespace differences.
+ See <a href="git-apply.html">git-apply(1)</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -1203,8 +1209,8 @@ apply.whitespace
</dt>
<dd>
<p>
- When no <code>--whitespace</code> flag is given from the command
- line, this configuration item is used as the default.
+ Tells <em>git apply</em> how to handle whitespaces, in the same way
+ as the <code>--whitespace</code> option. See <a href="git-apply.html">git-apply(1)</a>.
</p>
</dd>
</dl></div>
@@ -1242,7 +1248,7 @@ subdirectory is checked and (if possible) updated.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-12-23 00:29:30 PST
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>