diff options
Diffstat (limited to 'git-am.html')
| -rw-r--r-- | git-am.html | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/git-am.html b/git-am.html index 80551be05..452d93395 100644 --- a/git-am.html +++ b/git-am.html @@ -1222,6 +1222,41 @@ information.</p></div> </div>
</div>
<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’s found there:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+am.keepcr
+</dt>
+<dd>
+<p>
+ If true, git-am will call git-mailsplit for patches in mbox format
+ with parameter <code>--keep-cr</code>. In this case git-mailsplit will
+ not remove <code>\r</code> from lines ending with <code>\r\n</code>. Can be overridden
+ by giving <code>--no-keep-cr</code> from the command line.
+ See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
+am.threeWay
+</dt>
+<dd>
+<p>
+ By default, <code>git am</code> will fail if the patch does not apply cleanly. When
+ set to true, this setting tells <code>git am</code> to fall back on 3-way merge if
+ the patch records the identity of blobs it is supposed to apply to and
+ we have those blobs available locally (equivalent to giving the <code>--3way</code>
+ option from the command line). Defaults to <code>false</code>.
+ See <a href="git-am.html">git-am(1)</a>.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-apply.html">git-apply(1)</a>.</p></div>
@@ -1238,7 +1273,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2022-08-18 14:11:07 PDT
+ 2022-09-14 13:23:11 PDT
</div>
</div>
</body>
|