summaryrefslogtreecommitdiffstats
path: root/git-mailinfo.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-05-17 06:40:45 +0900
committerJunio C Hamano <gitster@pobox.com>2021-05-17 06:40:45 +0900
commit608b11da2f9110b9b1ce96eb56f84676567afec3 (patch)
tree0906054dc79cb4c281e6095e61af93dce616e322 /git-mailinfo.html
parent766021adccd91e4e3bd819f1497156306f0e0687 (diff)
downloadgit-htmldocs-608b11da2f9110b9b1ce96eb56f84676567afec3.tar.gz
Autogenerated HTML docs for v2.32.0-rc0
Diffstat (limited to 'git-mailinfo.html')
-rw-r--r--git-mailinfo.html40
1 files changed, 38 insertions, 2 deletions
diff --git a/git-mailinfo.html b/git-mailinfo.html
index 44df23174..7199fc0f6 100644
--- a/git-mailinfo.html
+++ b/git-mailinfo.html
@@ -749,7 +749,9 @@ git-mailinfo(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git mailinfo</em> [-k|-b] [-u | --encoding=&lt;encoding&gt; | -n] [--[no-]scissors] &lt;msg&gt; &lt;patch&gt;</pre>
+<pre class="content"><em>git mailinfo</em> [-k|-b] [-u | --encoding=&lt;encoding&gt; | -n]
+ [--[no-]scissors] [--quoted-cr=&lt;action&gt;]
+ &lt;msg&gt; &lt;patch&gt;</pre>
<div class="attribution">
</div></div>
</div>
@@ -884,6 +886,40 @@ beginning of the proposed commit log message with a scissors line.</p></div>
</p>
</dd>
<dt class="hdlist1">
+--quoted-cr=&lt;action&gt;
+</dt>
+<dd>
+<p>
+ Action when processes email messages sent with base64 or
+ quoted-printable encoding, and the decoded lines end with a CRLF
+ instead of a simple LF.
+</p>
+<div class="paragraph"><p>The valid actions are:</p></div>
+<div class="openblock">
+<div class="content">
+<div class="ulist"><ul>
+<li>
+<p>
+<code>nowarn</code>: Git will do nothing when such a CRLF is found.
+</p>
+</li>
+<li>
+<p>
+<code>warn</code>: Git will issue a warning for each message if such a CRLF is
+ found.
+</p>
+</li>
+<li>
+<p>
+<code>strip</code>: Git will convert those CRLF to LF.
+</p>
+</li>
+</ul></div>
+</div></div>
+<div class="paragraph"><p>The default action could be set by configuration option <code>mailinfo.quotedCR</code>.
+If no such configuration option has been set, <code>warn</code> will be used.</p></div>
+</dd>
+<dt class="hdlist1">
&lt;msg&gt;
</dt>
<dd>
@@ -914,7 +950,7 @@ beginning of the proposed commit log message with a scissors line.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-02-26 10:29:29 JST
+ 2021-05-17 06:37:54 JST
</div>
</div>
</body>