Autogenerated HTML docs for v2.30.0-335-ge63628

1 files changed, 2 insertions, 85 deletions

diff --git a/git-blame.html b/git-blame.html
index 3ff88353a..96812ecfb 100644
--- a/git-blame.html
+++ b/git-blame.html
@@ -1345,90 +1345,7 @@ commit commentary), a blame viewer will not care.</td>
 <div class="sect1">

 <h2 id="_mapping_authors">MAPPING AUTHORS</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>If the file <code>.mailmap</code> exists at the toplevel of the repository, or at

-the location pointed to by the mailmap.file or mailmap.blob

-configuration options, it

-is used to map author and committer names and email addresses to

-canonical real names and email addresses.</p></div>

-<div class="paragraph"><p>In the simple form, each line in the file consists of the canonical

-real name of an author, whitespace, and an email address used in the

-commit (enclosed by <em>&lt;</em> and <em>&gt;</em>) to map to the name. For example:</p></div>

-<div class="openblock">

-<div class="content">

-<div class="literalblock">

-<div class="content">

-<pre><code>Proper Name &lt;commit@email.xx&gt;</code></pre>

-</div></div>

-</div></div>

-<div class="paragraph"><p>The more complex forms are:</p></div>

-<div class="openblock">

-<div class="content">

-<div class="literalblock">

-<div class="content">

-<pre><code>&lt;proper@email.xx&gt; &lt;commit@email.xx&gt;</code></pre>

-</div></div>

-</div></div>

-<div class="paragraph"><p>which allows mailmap to replace only the email part of a commit, and:</p></div>

-<div class="openblock">

-<div class="content">

-<div class="literalblock">

-<div class="content">

-<pre><code>Proper Name &lt;proper@email.xx&gt; &lt;commit@email.xx&gt;</code></pre>

-</div></div>

-</div></div>

-<div class="paragraph"><p>which allows mailmap to replace both the name and the email of a

-commit matching the specified commit email address, and:</p></div>

-<div class="openblock">

-<div class="content">

-<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 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>Example 1: Your history contains commits by two authors, Jane

-and Joe, whose names appear in the repository under several forms:</p></div>

-<div class="listingblock">

-<div class="content">

-<pre><code>Joe Developer &lt;joe@example.com&gt;

-Joe R. Developer &lt;joe@example.com&gt;

-Jane Doe &lt;jane@example.com&gt;

-Jane Doe &lt;jane@laptop.(none)&gt;

-Jane D. &lt;jane@desktop.(none)&gt;</code></pre>

-</div></div>

-<div class="paragraph"><p>Now suppose that Joe wants his middle name initial used, and Jane

-prefers her family name fully spelled out. A proper <code>.mailmap</code> file

-would look like:</p></div>

-<div class="listingblock">

-<div class="content">

-<pre><code>Jane Doe         &lt;jane@desktop.(none)&gt;

-Joe R. Developer &lt;joe@example.com&gt;</code></pre>

-</div></div>

-<div class="paragraph"><p>Note how there is no need for an entry for <code>&lt;jane@laptop.(none)&gt;</code>, because the

-real name of that author is already correct.</p></div>

-<div class="paragraph"><p>Example 2: Your repository contains commits from the following

-authors:</p></div>

-<div class="listingblock">

-<div class="content">

-<pre><code>nick1 &lt;bugs@company.xx&gt;

-nick2 &lt;bugs@company.xx&gt;

-nick2 &lt;nick2@company.xx&gt;

-santa &lt;me@company.xx&gt;

-claus &lt;me@company.xx&gt;

-CTO &lt;cto@coompany.xx&gt;</code></pre>

-</div></div>

-<div class="paragraph"><p>Then you might want a <code>.mailmap</code> file that looks like:</p></div>

-<div class="listingblock">

-<div class="content">

-<pre><code>&lt;cto@company.xx&gt;                       &lt;cto@coompany.xx&gt;

-Some Dude &lt;some@dude.xx&gt;         nick1 &lt;bugs@company.xx&gt;

-Other Author &lt;other@author.xx&gt;   nick2 &lt;bugs@company.xx&gt;

-Other Author &lt;other@author.xx&gt;         &lt;nick2@company.xx&gt;

-Santa Claus &lt;santa.claus@northpole.xx&gt; &lt;me@company.xx&gt;</code></pre>

-</div></div>

-<div class="paragraph"><p>Use hash <em>#</em> for comments that are either on their own line, or after

-the email address.</p></div>

+<div class="paragraph"><p>See <a href="gitmailmap.html">gitmailmap(5)</a>.</p></div>

 </div>

 </div>

 <div class="sect1">

@@ -1448,7 +1365,7 @@ the email address.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-11 14:07:52 PST

+ 2021-01-25 15:29:19 PST

 </div>

 </div>

 </body>