diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
| commit | ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch) | |
| tree | 390507328a7564b65dc803683c34235700b97409 /git-blame.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-blame.html')
| -rw-r--r-- | git-blame.html | 202 |
1 files changed, 125 insertions, 77 deletions
diff --git a/git-blame.html b/git-blame.html index 84a08c4d2..1e92ad4e5 100644 --- a/git-blame.html +++ b/git-blame.html @@ -3,7 +3,7 @@ <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 7.0.2" />
+<meta name="generator" content="AsciiDoc 8.2.5" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -16,8 +16,13 @@ body { margin: 1em 5% 1em 5%;
}
-a { color: blue; }
-a:visited { color: fuchsia; }
+a {
+ color: blue;
+ text-decoration: underline;
+}
+a:visited {
+ color: fuchsia;
+}
em {
font-style: italic;
@@ -39,13 +44,18 @@ h1, h2, h3, h4, h5, h6 { line-height: 1.3;
}
-h1 {
+h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
- border-bottom: 2px solid silver;
padding-top: 0.5em;
}
+h3 {
+ float: left;
+}
+h3 + * {
+ clear: left;
+}
div.sectionbody {
font-family: serif;
@@ -70,7 +80,7 @@ span#author { color: #527bbd;
font-family: sans-serif;
font-weight: bold;
- font-size: 1.2em;
+ font-size: 1.1em;
}
span#email {
}
@@ -139,6 +149,9 @@ div.sidebarblock > div.content { padding: 0.5em;
}
+div.listingblock {
+ margin-right: 0%;
+}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
@@ -148,9 +161,13 @@ div.listingblock > div.content { div.quoteblock > div.content {
padding-left: 2.0em;
}
-div.quoteblock .attribution {
+
+div.attribution {
text-align: right;
}
+div.verseblock + div.attribution {
+ text-align: left;
+}
div.admonitionblock .icon {
vertical-align: top;
@@ -194,13 +211,12 @@ dd > *:first-child { ul, ol {
list-style-position: outside;
}
-ol.olist2 {
+div.olist2 ol {
list-style-type: lower-alpha;
}
div.tableblock > table {
- border-color: #527bbd;
- border-width: 3px;
+ border: 3px solid #527bbd;
}
thead {
font-family: sans-serif;
@@ -214,6 +230,9 @@ div.hlist { margin-top: 0.8em;
margin-bottom: 0.8em;
}
+div.hlist td {
+ padding-bottom: 5px;
+}
td.hlist1 {
vertical-align: top;
font-style: italic;
@@ -226,7 +245,33 @@ td.hlist2 { @media print {
div#footer-badges { display: none; }
}
-include::./stylesheets/xhtml11-manpage.css[]
+
+div#toctitle {
+ color: #527bbd;
+ font-family: sans-serif;
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-top: 1.0em;
+ margin-bottom: 0.1em;
+}
+
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+div.toclevel2 {
+ margin-left: 2em;
+ font-size: 0.9em;
+}
+div.toclevel3 {
+ margin-left: 4em;
+ font-size: 0.9em;
+}
+div.toclevel4 {
+ margin-left: 6em;
+ font-size: 0.9em;
+}
+include1::./stylesheets/xhtml11-manpage.css[]
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -255,6 +300,9 @@ div.exampleblock-content { border-left: 2px solid silver;
padding-left: 0.5em;
}
+
+/* IE6 sets dynamically generated links as visited. */
+div#toc a:visited { color: blue; }
</style>
<title>git-blame(1)</title>
</head>
@@ -277,19 +325,19 @@ git-blame(1) Manual Page [-S <revs-file>] [-M] [-C] [-C] [--since=<date>]
[<rev> | --contents <file>] [--] <file></div></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<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>
-<p>Also it can limit the range of lines annotated.</p>
-<p>This report doesn't tell you anything about lines which have been deleted or
-replaced; you need to use a tool such as <tt>git-diff</tt> or the "pickaxe"
-interface briefly mentioned in the following paragraph.</p>
-<p>Apart from supporting file annotation, git also supports searching the
+<div class="para"><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>Also it can limit the range of lines annotated.</p></div>
+<div class="para"><p>This report doesn't 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
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
-a text string in the diff. A small example:</p>
+a text string in the diff. A small example:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git log --pretty=oneline -S'blame_usage'
@@ -297,9 +345,9 @@ a text string in the diff. A small example:</p> ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre>
</div></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
-b
</dt>
@@ -334,30 +382,30 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> Annotate only the given line range. <start> and <end> can take
one of these forms:
</p>
-<ul>
+<div class="ilist"><ul>
<li>
<p>
number
</p>
-<p>If <start> or <end> is a number, it specifies an
-absolute line number (lines count from 1).</p>
+<div class="para"><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>
-<p>This form will use the first line matching the given
+<div class="para"><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>
+starting at the line given by <start>.</p></div>
</li>
<li>
<p>
+offset or -offset
</p>
-<p>This is only valid for <end> and will specify a number
-of lines before or after the line given by <start>.</p>
+<div class="para"><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>
+</ul></div>
</dd>
<dt>
-l
@@ -429,10 +477,10 @@ of lines before or after the line given by <start>.</p> to the child commit. With this option, both groups of lines
are blamed on the parent.
</p>
-<p><num> is optional but it is the lower bound on the number of
+<div class="para"><p><num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving
within a file for it to associate those lines with the parent
-commit.</p>
+commit.</p></div>
</dd>
<dt>
-C|<num>|
@@ -446,10 +494,10 @@ commit.</p> the command looks for copies from all other files in the
parent for the commit that creates the file in addition.
</p>
-<p><num> is optional but it is the lower bound on the number of
+<div class="para"><p><num> is optional but it is the lower bound on the number of
alphanumeric characters that git must detect as moving
between files for it to associate those lines with the parent
-commit.</p>
+commit.</p></div>
</dd>
<dt>
-h
@@ -480,7 +528,7 @@ commit.</p> file (see <tt>-M</tt>). The first number listed is the score.
This is the number of alphanumeric characters detected
to be moved between or within files. This must be above
- a certain threshold for <tt>git-blame</tt> to consider those lines
+ a certain threshold for <em>git-blame</em> to consider those lines
of code to have been moved.
</p>
</dd>
@@ -525,13 +573,13 @@ commit.</p> child's to find where the lines came from.
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>THE PORCELAIN FORMAT</h2>
+<h2 id="_the_porcelain_format">THE PORCELAIN FORMAT</h2>
<div class="sectionbody">
-<p>In this format, each line is output after a header; the
-header at the minimum has the first line which has:</p>
-<ul>
+<div class="para"><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>
<li>
<p>
40-byte SHA-1 of the commit the line is attributed to;
@@ -554,10 +602,10 @@ on a line that starts a group of line from a different group. On subsequent lines this field is absent.
</p>
</li>
-</ul>
-<p>This header line is followed by the following information
-at least once for each commit:</p>
-<ul>
+</ul></div>
+<div class="para"><p>This header line is followed by the following information
+at least once for each commit:</p></div>
+<div class="ilist"><ul>
<li>
<p>
author name ("author"), email ("author-mail"), time
@@ -575,70 +623,70 @@ filename in the commit the line is attributed to. the first line of the commit log message ("summary").
</p>
</li>
-</ul>
-<p>The contents of the actual line is output after the above
+</ul></div>
+<div class="para"><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>
+header elements later.</p></div>
</div>
-<h2>SPECIFYING RANGES</h2>
+<h2 id="_specifying_ranges">SPECIFYING RANGES</h2>
<div class="sectionbody">
-<p>Unlike <tt>git-blame</tt> and <tt>git-annotate</tt> in older git, the extent
+<div class="para"><p>Unlike <em>git-blame</em> and <em>git-annotate</em> in older git, the extent
of annotation can be limited to both line ranges and revision
ranges. When you are interested in finding the origin for
ll. 40-60 for file <tt>foo</tt>, you can use <tt>-L</tt> option like these
(they mean the same thing — both ask for 21 lines starting at
-line 40):</p>
+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>
-<p>Also you can use regular expression to specify the line range.</p>
+<div class="para"><p>Also you can use 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>
-<p>would limit the annotation to the body of <tt>hello</tt> subroutine.</p>
-<p>When you are not interested in changes older than the version
+<div class="para"><p>would limit the annotation to the body of <tt>hello</tt> subroutine.</p></div>
+<div class="para"><p>When you are not interested in changes older than the version
v2.6.18, or changes older than 3 weeks, you can use revision
-range specifiers similar to <tt>git-rev-list</tt>:</p>
+range specifiers similar to <em>git-rev-list</em>:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git blame v2.6.18.. -- foo
git blame --since=3.weeks -- foo</tt></pre>
</div></div>
-<p>When revision range specifiers are used to limit the annotation,
+<div class="para"><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>
-<p>A particularly useful way is to see if an added file have lines
+boundary commit.</p></div>
+<div class="para"><p>A particularly useful way is to see if an added file have 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
-introduced the file with:</p>
+introduced the file with:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git log --diff-filter=A --pretty=short -- foo</tt></pre>
</div></div>
-<p>and then annotate the change between the commit and its
-parents, using <tt>commit^!</tt> notation:</p>
+<div class="para"><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">
<pre><tt>git blame -C -C -f $commit^! -- foo</tt></pre>
</div></div>
</div>
-<h2>INCREMENTAL OUTPUT</h2>
+<h2 id="_incremental_output">INCREMENTAL OUTPUT</h2>
<div class="sectionbody">
-<p>When called with <tt>--incremental</tt> option, the command outputs the
+<div class="para"><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>
-<p>The output format is similar to the Porcelain format, but it
+interactive viewers.</p></div>
+<div class="para"><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>
-<ol>
+annotated.</p></div>
+<div class="olist"><ol>
<li>
<p>
Each blame entry always starts with a line of:
@@ -647,7 +695,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>
-<p>Line numbers count from 1.</p>
+<div class="para"><p>Line numbers count from 1.</p></div>
</li>
<li>
<p>
@@ -666,8 +714,8 @@ Unlike Porcelain format, the filename information is always <div class="content">
<pre><tt>"filename" <whitespace-quoted-filename-goes-here></tt></pre>
</div></div>
-<p>and thus it's really quite easy to parse for some line- and word-oriented
-parser (which should be quite natural for most scripting languages).</p>
+<div class="para"><p>and thus it's 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>
<td class="icon">
@@ -682,23 +730,23 @@ commit commentary), a blame viewer won't ever care.</td> </tr></table>
</div>
</li>
-</ol>
+</ol></div>
</div>
-<h2>SEE ALSO</h2>
+<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<p><a href="git-annotate.html">git-annotate(1)</a></p>
+<div class="para"><p><a href="git-annotate.html">git-annotate(1)</a></p></div>
</div>
-<h2>AUTHOR</h2>
+<h2 id="_author">AUTHOR</h2>
<div class="sectionbody">
-<p>Written by Junio C Hamano <junkio@cox.net></p>
+<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>
</div>
-<h2>GIT</h2>
+<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<p>Part of the <a href="git.html">git(1)</a> suite</p>
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 02-Jul-2008 03:01:33 UTC
+Last updated 2008-07-06 05:16:35 UTC
</div>
</div>
</body>
|