diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-12-01 03:09:23 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-12-01 03:09:23 +0000 |
| commit | ed69a7415076fcb4dbebd7d4ecdbf32621b1a246 (patch) | |
| tree | 43999623551eb410aefa91ea2f7c424add86079a /git-blame.html | |
| parent | 97bcb48c6f2fa3ff8c49372fb6057ebd66b78537 (diff) | |
| download | git-htmldocs-ed69a7415076fcb4dbebd7d4ecdbf32621b1a246.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-430-g208247
Diffstat (limited to 'git-blame.html')
| -rw-r--r-- | git-blame.html | 315 |
1 files changed, 211 insertions, 104 deletions
diff --git a/git-blame.html b/git-blame.html index 2c7a6650b..c45b75ea5 100644 --- a/git-blame.html +++ b/git-blame.html @@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>git-blame(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
- margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { padding: 0.5em;
}
-div.listingblock {
- margin-right: 0%;
-}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
-div.quoteblock > div.content {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { padding: 0.5em;
}
-div.verseblock div.content {
- white-space: pre;
-}
-
div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { tfoot {
font-weight: bold;
}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
+
-div.hlist {
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
}
-td.hlist1 {
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
+}
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-blame(1)</title>
</head>
<body>
<div id="header">
@@ -318,22 +412,24 @@ git-blame(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git blame</em> [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-p] [-w] [--incremental] [-L n,m]
+<div class="verseblock-content"><em>git blame</em> [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] [-L n,m]
[-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
- [<rev> | --contents <file> | --reverse <rev>] [--] <file></div></div>
+ [<rev> | --contents <file> | --reverse <rev>] [--] <file></div>
+<div class="verseblock-attribution">
+</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>Annotates each line in the given file with information from the revision which
+<div class="paragraph"><p>Annotates each line in the given file with information from the revision which
last modified the line. Optionally, start annotating from the given revision.</p></div>
-<div class="para"><p>The command can also limit the range of lines annotated.</p></div>
-<div class="para"><p>The report does not tell you anything about lines which have been deleted or
+<div class="paragraph"><p>The command can also limit the range of lines annotated.</p></div>
+<div class="paragraph"><p>The report does not tell you anything about lines which have been deleted or
replaced; you need to use a tool such as <em>git diff</em> or the "pickaxe"
interface briefly mentioned in the following paragraph.</p></div>
-<div class="para"><p>Apart from supporting file annotation, git also supports searching the
+<div class="paragraph"><p>Apart from supporting file annotation, git also supports searching the
development history for when a code snippet occurred in a change. This makes it
possible to track when a code snippet was added to a file, moved or copied
between files, and eventually deleted or replaced. It works by searching for
@@ -347,8 +443,8 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> </div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
-b
</dt>
<dd>
@@ -357,7 +453,7 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> be controlled via the <tt>blame.blankboundary</tt> config option.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--root
</dt>
<dd>
@@ -366,7 +462,7 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> controlled via the <tt>blame.showroot</tt> config option.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--show-stats
</dt>
<dd>
@@ -374,7 +470,7 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> Include additional statistics at the end of blame output.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-L <start>,<end>
</dt>
<dd>
@@ -382,19 +478,19 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> Annotate only the given line range. <start> and <end> can take
one of these forms:
</p>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
number
</p>
-<div class="para"><p>If <start> or <end> is a number, it specifies an
+<div class="paragraph"><p>If <start> or <end> is a number, it specifies an
absolute line number (lines count from 1).</p></div>
</li>
<li>
<p>
/regex/
</p>
-<div class="para"><p>This form will use the first line matching the given
+<div class="paragraph"><p>This form will use the first line matching the given
POSIX regex. If <end> is a regex, it will search
starting at the line given by <start>.</p></div>
</li>
@@ -402,12 +498,12 @@ starting at the line given by <start>.</p></div> <p>
+offset or -offset
</p>
-<div class="para"><p>This is only valid for <end> and will specify a number
+<div class="paragraph"><p>This is only valid for <end> and will specify a number
of lines before or after the line given by <start>.</p></div>
</li>
</ul></div>
</dd>
-<dt>
+<dt class="hdlist1">
-l
</dt>
<dd>
@@ -415,7 +511,7 @@ of lines before or after the line given by <start>.</p></div> Show long rev (Default: off).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-t
</dt>
<dd>
@@ -423,7 +519,7 @@ of lines before or after the line given by <start>.</p></div> Show raw timestamp (Default: off).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-S <revs-file>
</dt>
<dd>
@@ -431,7 +527,7 @@ of lines before or after the line given by <start>.</p></div> Use revisions from revs-file instead of calling <a href="git-rev-list.html">git-rev-list(1)</a>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--reverse
</dt>
<dd>
@@ -443,10 +539,10 @@ of lines before or after the line given by <start>.</p></div> START.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-p
</dt>
-<dt>
+<dt class="hdlist1">
--porcelain
</dt>
<dd>
@@ -454,7 +550,7 @@ of lines before or after the line given by <start>.</p></div> Show in a format designed for machine consumption.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--incremental
</dt>
<dd>
@@ -463,7 +559,7 @@ of lines before or after the line given by <start>.</p></div> machine consumption.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--encoding=<encoding>
</dt>
<dd>
@@ -475,7 +571,7 @@ of lines before or after the line given by <start>.</p></div> manual page.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--contents <file>
</dt>
<dd>
@@ -487,7 +583,7 @@ of lines before or after the line given by <start>.</p></div> <tt>-</tt> to make the command read from the standard input).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--date <format>
</dt>
<dd>
@@ -500,7 +596,7 @@ of lines before or after the line given by <start>.</p></div> of the --date option at <a href="git-log.html">git-log(1)</a>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-M|<num>|
</dt>
<dd>
@@ -515,12 +611,12 @@ of lines before or after the line given by <start>.</p></div> option, both groups of lines are blamed on the parent by
running extra passes of inspection.
</p>
-<div class="para"><p><num> is optional but it is the lower bound on the number of
+<div class="paragraph"><p><num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving/copying
within a file for it to associate those lines with the parent
commit. The default value is 20.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
-C|<num>|
</dt>
<dd>
@@ -534,17 +630,17 @@ commit. The default value is 20.</p></div> option is given three times, the command additionally
looks for copies from other files in any commit.
</p>
-<div class="para"><p><num> is optional but it is the lower bound on the number of
+<div class="paragraph"><p><num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving/copying
between files for it to associate those lines with the parent
commit. And the default value is 40. If there are more than one
<tt>-C</tt> options given, the <num> argument of the last <tt>-C</tt> will
take effect.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
-h
</dt>
-<dt>
+<dt class="hdlist1">
--help
</dt>
<dd>
@@ -552,7 +648,7 @@ take effect.</p></div> Show help message.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-c
</dt>
<dd>
@@ -560,7 +656,7 @@ take effect.</p></div> Use the same output mode as <a href="git-annotate.html">git-annotate(1)</a> (Default: off).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--score-debug
</dt>
<dd>
@@ -574,10 +670,10 @@ take effect.</p></div> of code to have been moved.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-f
</dt>
-<dt>
+<dt class="hdlist1">
--show-name
</dt>
<dd>
@@ -587,10 +683,10 @@ take effect.</p></div> file with a different name, due to rename detection.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-n
</dt>
-<dt>
+<dt class="hdlist1">
--show-number
</dt>
<dd>
@@ -598,7 +694,7 @@ take effect.</p></div> Show the line number in the original commit (Default: off).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-s
</dt>
<dd>
@@ -606,22 +702,33 @@ take effect.</p></div> Suppress the author name and timestamp from the output.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
+-e
+</dt>
+<dt class="hdlist1">
+--show-email
+</dt>
+<dd>
+<p>
+ Show the author email instead of author name (Default: off).
+</p>
+</dd>
+<dt class="hdlist1">
-w
</dt>
<dd>
<p>
- Ignore whitespace when comparing the parent's version and
- the child's to find where the lines came from.
+ Ignore whitespace when comparing the parent’s version and
+ the child’s to find where the lines came from.
</p>
</dd>
</dl></div>
</div>
<h2 id="_the_porcelain_format">THE PORCELAIN FORMAT</h2>
<div class="sectionbody">
-<div class="para"><p>In this format, each line is output after a header; the
+<div class="paragraph"><p>In this format, each line is output after a header; the
header at the minimum has the first line which has:</p></div>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
40-byte SHA-1 of the commit the line is attributed to;
@@ -645,9 +752,9 @@ on a line that starts a group of lines from a different </p>
</li>
</ul></div>
-<div class="para"><p>This header line is followed by the following information
+<div class="paragraph"><p>This header line is followed by the following information
at least once for each commit:</p></div>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
the author name ("author"), email ("author-mail"), time
@@ -666,30 +773,30 @@ the first line of the commit log message ("summary"). </p>
</li>
</ul></div>
-<div class="para"><p>The contents of the actual line is output after the above
+<div class="paragraph"><p>The contents of the actual line is output after the above
header, prefixed by a TAB. This is to allow adding more
header elements later.</p></div>
</div>
<h2 id="_specifying_ranges">SPECIFYING RANGES</h2>
<div class="sectionbody">
-<div class="para"><p>Unlike <em>git blame</em> and <em>git annotate</em> in older versions of git, the extent
+<div class="paragraph"><p>Unlike <em>git blame</em> and <em>git annotate</em> in older versions of git, the extent
of the annotation can be limited to both line ranges and revision
ranges. When you are interested in finding the origin for
lines 40-60 for file <tt>foo</tt>, you can use the <tt>-L</tt> option like so
-(they mean the same thing — both ask for 21 lines starting at
+(they mean the same thing — both ask for 21 lines starting at
line 40):</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git blame -L 40,60 foo
git blame -L 40,+21 foo</tt></pre>
</div></div>
-<div class="para"><p>Also you can use a regular expression to specify the line range:</p></div>
+<div class="paragraph"><p>Also you can use a regular expression to specify the line range:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git blame -L '/^sub hello {/,/^}$/' foo</tt></pre>
</div></div>
-<div class="para"><p>which limits the annotation to the body of the <tt>hello</tt> subroutine.</p></div>
-<div class="para"><p>When you are not interested in changes older than version
+<div class="paragraph"><p>which limits the annotation to the body of the <tt>hello</tt> subroutine.</p></div>
+<div class="paragraph"><p>When you are not interested in changes older than version
v2.6.18, or changes older than 3 weeks, you can use revision
range specifiers similar to <em>git rev-list</em>:</p></div>
<div class="literalblock">
@@ -697,12 +804,12 @@ range specifiers similar to <em>git rev-list</em>:</p></div> <pre><tt>git blame v2.6.18.. -- foo
git blame --since=3.weeks -- foo</tt></pre>
</div></div>
-<div class="para"><p>When revision range specifiers are used to limit the annotation,
+<div class="paragraph"><p>When revision range specifiers are used to limit the annotation,
lines that have not changed since the range boundary (either the
commit v2.6.18 or the most recent commit that is more than 3
weeks old in the above example) are blamed for that range
boundary commit.</p></div>
-<div class="para"><p>A particularly useful way is to see if an added file has lines
+<div class="paragraph"><p>A particularly useful way is to see if an added file has lines
created by copy-and-paste from existing files. Sometimes this
indicates that the developer was being sloppy and did not
refactor the code properly. You can first find the commit that
@@ -711,7 +818,7 @@ introduced the file with:</p></div> <div class="content">
<pre><tt>git log --diff-filter=A --pretty=short -- foo</tt></pre>
</div></div>
-<div class="para"><p>and then annotate the change between the commit and its
+<div class="paragraph"><p>and then annotate the change between the commit and its
parents, using <tt>commit^!</tt> notation:</p></div>
<div class="literalblock">
<div class="content">
@@ -720,15 +827,15 @@ parents, using <tt>commit^!</tt> notation:</p></div> </div>
<h2 id="_incremental_output">INCREMENTAL OUTPUT</h2>
<div class="sectionbody">
-<div class="para"><p>When called with <tt>--incremental</tt> option, the command outputs the
+<div class="paragraph"><p>When called with <tt>--incremental</tt> option, the command outputs the
result as it is built. The output generally will talk about
lines touched by more recent commits first (i.e. the lines will
be annotated out of order) and is meant to be used by
interactive viewers.</p></div>
-<div class="para"><p>The output format is similar to the Porcelain format, but it
+<div class="paragraph"><p>The output format is similar to the Porcelain format, but it
does not contain the actual lines from the file that is being
annotated.</p></div>
-<div class="olist"><ol>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
Each blame entry always starts with a line of:
@@ -737,7 +844,7 @@ Each blame entry always starts with a line of: <div class="content">
<pre><tt><40-byte hex sha1> <sourceline> <resultline> <num_lines></tt></pre>
</div></div>
-<div class="para"><p>Line numbers count from 1.</p></div>
+<div class="paragraph"><p>Line numbers count from 1.</p></div>
</li>
<li>
<p>
@@ -756,7 +863,7 @@ Unlike the Porcelain format, the filename information is always <div class="content">
<pre><tt>"filename" <whitespace-quoted-filename-goes-here></tt></pre>
</div></div>
-<div class="para"><p>and thus it is really quite easy to parse for some line- and word-oriented
+<div class="paragraph"><p>and thus it is really quite easy to parse for some line- and word-oriented
parser (which should be quite natural for most scripting languages).</p></div>
<div class="admonitionblock">
<table><tr>
@@ -776,36 +883,36 @@ commit commentary), a blame viewer will not care.</td> </div>
<h2 id="_mapping_authors">MAPPING AUTHORS</h2>
<div class="sectionbody">
-<div class="para"><p>If the file <tt>.mailmap</tt> exists at the toplevel of the repository, or at
+<div class="paragraph"><p>If the file <tt>.mailmap</tt> exists at the toplevel of the repository, or at
the location pointed to by the mailmap.file configuration option, it
is used to map author and committer names and email addresses to
canonical real names and email addresses.</p></div>
-<div class="para"><p>In the simple form, each line in the file consists of the canonical
+<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="literalblock">
<div class="content">
<pre><tt>Proper Name <commit@email.xx></tt></pre>
</div></div>
-<div class="para"><p>The more complex forms are:</p></div>
+<div class="paragraph"><p>The more complex forms are:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt><proper@email.xx> <commit@email.xx></tt></pre>
</div></div>
-<div class="para"><p>which allows mailmap to replace only the email part of a commit, and:</p></div>
+<div class="paragraph"><p>which allows mailmap to replace only the email part of a commit, and:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>Proper Name <proper@email.xx> <commit@email.xx></tt></pre>
</div></div>
-<div class="para"><p>which allows mailmap to replace both the name and the email of a
+<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="literalblock">
<div class="content">
<pre><tt>Proper Name <proper@email.xx> Commit Name <commit@email.xx></tt></pre>
</div></div>
-<div class="para"><p>which allows mailmap to replace both the name and the email of a
+<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="para"><p>Example 1: Your history contains commits by two authors, Jane
+<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">
@@ -815,7 +922,7 @@ Jane Doe <jane@example.com> Jane Doe <jane@laptop.(none)>
Jane D. <jane@desktop.(none)></tt></pre>
</div></div>
-<div class="para"><p>Now suppose that Joe wants his middle name initial used, and Jane
+<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 <tt>.mailmap</tt> file
would look like:</p></div>
<div class="listingblock">
@@ -823,9 +930,9 @@ would look like:</p></div> <pre><tt>Jane Doe <jane@desktop.(none)>
Joe R. Developer <joe@example.com></tt></pre>
</div></div>
-<div class="para"><p>Note how there is no need for an entry for <jane@laptop.(none)>, because the
+<div class="paragraph"><p>Note how there is no need for an entry for <<a href="mailto:jane@laptop">jane@laptop</a>.(none)>, because the
real name of that author is already correct.</p></div>
-<div class="para"><p>Example 2: Your repository contains commits from the following
+<div class="paragraph"><p>Example 2: Your repository contains commits from the following
authors:</p></div>
<div class="listingblock">
<div class="content">
@@ -836,7 +943,7 @@ santa <me@company.xx> claus <me@company.xx>
CTO <cto@coompany.xx></tt></pre>
</div></div>
-<div class="para"><p>Then you might want a <tt>.mailmap</tt> file that looks like:</p></div>
+<div class="paragraph"><p>Then you might want a <tt>.mailmap</tt> file that looks like:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt><cto@company.xx> <cto@coompany.xx>
@@ -845,24 +952,24 @@ 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></tt></pre>
</div></div>
-<div class="para"><p>Use hash <em>#</em> for comments that are either on their own line, or after
+<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>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<div class="para"><p><a href="git-annotate.html">git-annotate(1)</a></p></div>
+<div class="paragraph"><p><a href="git-annotate.html">git-annotate(1)</a></p></div>
</div>
<h2 id="_author">AUTHOR</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>
+<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-18 23:56:34 UTC
+Last updated 2010-12-01 03:09:03 UTC
</div>
</div>
</body>
|