summaryrefslogtreecommitdiffstats
path: root/gitmailmap.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-25 17:34:37 -0800
committerJunio C Hamano <gitster@pobox.com>2021-02-25 17:34:37 -0800
commita372d5bb569776befd395d9c66067ecc09f13b96 (patch)
treee9f46a0ff18a8d49520307068a47e8944c44aa3d /gitmailmap.html
parenta70c988a0584e1197ffd19b26c28e9790da32363 (diff)
downloadgit-htmldocs-a372d5bb569776befd395d9c66067ecc09f13b96.tar.gz
Autogenerated HTML docs for v2.31.0-rc0
Diffstat (limited to 'gitmailmap.html')
-rw-r--r--gitmailmap.html15
1 files changed, 9 insertions, 6 deletions
diff --git a/gitmailmap.html b/gitmailmap.html
index 5f3a61584..35f1707a1 100644
--- a/gitmailmap.html
+++ b/gitmailmap.html
@@ -804,10 +804,13 @@ commit matching the specified commit email address, and:</p></div>
<div class="paragraph"><p>which allows mailmap to replace both the name and the email of a
commit matching both the specified commit name and email address.</p></div>
<div class="paragraph"><p>Both E-Mails and names are matched case-insensitively. For example
-this would also match the <em>Commit Name &lt;<a href="mailto:commit@email.xx">commit@email.xx</a>&gt;</em> above:</p></div>
+this would also match the <em>Commit Name &lt;commit&#64;email.xx&gt;</em> above:</p></div>
<div class="openblock">
<div class="content">
-<div class="paragraph"><p>Proper Name &lt;<a href="mailto:proper@email.xx">proper@email.xx</a>&gt; CoMmIt NaMe &lt;<a href="mailto:CoMmIt@EmAiL.xX">CoMmIt@EmAiL.xX</a>&gt;</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Proper Name &lt;proper@email.xx&gt; CoMmIt NaMe &lt;CoMmIt@EmAiL.xX&gt;</code></pre>
+</div></div>
</div></div>
</div>
</div>
@@ -833,10 +836,10 @@ correct the names would look like:</p></div>
Jane Doe &lt;jane@example.com&gt;
Jane Doe &lt;jane@desktop.(none)&gt;</code></pre>
</div></div>
-<div class="paragraph"><p>Note that there&#8217;s no need to map the name for <em>jane@laptop.(none)</em> to
+<div class="paragraph"><p>Note that there&#8217;s no need to map the name for <em>&lt;jane&#64;laptop.(none)&gt;</em> to
only correct the names. However, leaving the obviously broken
-<code>&lt;jane@laptop.(none)&gt;' and '&lt;jane@desktop.(none)&gt;' E-Mails as-is is
-usually not what you want. A `.mailmap</code> file which also corrects those
+<em>&lt;jane&#64;laptop.(none)&gt;</em> and <em>&lt;jane&#64;desktop.(none)&gt;</em> E-Mails as-is is
+usually not what you want. A <code>.mailmap</code> file which also corrects those
is:</p></div>
<div class="listingblock">
<div class="content">
@@ -881,7 +884,7 @@ Jane Doe &lt;jane@example.com&gt; Jane &lt;bugs@example.com&gt;</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-01-25 15:29:19 PST
+ 2021-02-25 17:29:29 PST
</div>
</div>
</body>