diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 15:32:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 15:32:33 -0800 |
commit | 7887f9b4eb248358cc8e6937ceb87b9f072ce9e5 (patch) | |
tree | d5670ef418f9f7d4a5780ee5d3d01696abb477aa /git-shortlog.html | |
parent | d5cfc8f5a014ca40c71c8355aa37074cc885297e (diff) | |
download | git-htmldocs-7887f9b4eb248358cc8e6937ceb87b9f072ce9e5.tar.gz |
Autogenerated HTML docs for v2.30.0-335-ge63628
Diffstat (limited to 'git-shortlog.html')
-rw-r--r-- | git-shortlog.html | 90 |
1 files changed, 2 insertions, 88 deletions
diff --git a/git-shortlog.html b/git-shortlog.html index 720adb148..89a5e6710 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -1939,93 +1939,7 @@ commits are marked as TREESAME (subject to be simplified away).</p></div> <div class="sect1">
<h2 id="_mapping_authors">MAPPING AUTHORS</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The <code>.mailmap</code> feature is used to coalesce together commits by the same
-person in the shortlog, where their name and/or email address was
-spelled differently.</p></div>
-<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><</em> and <em>></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 <commit@email.xx></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><proper@email.xx> <commit@email.xx></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 <proper@email.xx> <commit@email.xx></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 <proper@email.xx> Commit Name <commit@email.xx></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 <joe@example.com>
-Joe R. Developer <joe@example.com>
-Jane Doe <jane@example.com>
-Jane Doe <jane@laptop.(none)>
-Jane D. <jane@desktop.(none)></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 <jane@desktop.(none)>
-Joe R. Developer <joe@example.com></code></pre>
-</div></div>
-<div class="paragraph"><p>Note how there is no need for an entry for <code><jane@laptop.(none)></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 <bugs@company.xx>
-nick2 <bugs@company.xx>
-nick2 <nick2@company.xx>
-santa <me@company.xx>
-claus <me@company.xx>
-CTO <cto@coompany.xx></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><cto@company.xx> <cto@coompany.xx>
-Some Dude <some@dude.xx> nick1 <bugs@company.xx>
-Other Author <other@author.xx> nick2 <bugs@company.xx>
-Other Author <other@author.xx> <nick2@company.xx>
-Santa Claus <santa.claus@northpole.xx> <me@company.xx></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">
@@ -2039,7 +1953,7 @@ the email address.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-10-04 13:41:15 PDT
+ 2021-01-25 15:29:19 PST
</div>
</div>
</body>
|