diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-10-25 22:55:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-10-25 22:55:31 +0000 |
| commit | ff4b4317784217ee2620caf2cd06b3d4b6b00a9a (patch) | |
| tree | fe258b15e72bbf6e1a04624ab94052e6f39c00c0 /git-blame.html | |
| parent | 249572f7c8a246cc1bb6c31a30d599f85bb10cb9 (diff) | |
| download | git-htmldocs-ff4b4317784217ee2620caf2cd06b3d4b6b00a9a.tar.gz | |
Autogenerated HTML docs for v1.4.3.3-geb15
Diffstat (limited to 'git-blame.html')
| -rw-r--r-- | git-blame.html | 83 |
1 files changed, 81 insertions, 2 deletions
diff --git a/git-blame.html b/git-blame.html index 825997579..235506d64 100644 --- a/git-blame.html +++ b/git-blame.html @@ -272,7 +272,7 @@ git-blame(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-blame</em> [-c] [-l] [-t] [-S <revs-file>] [--] <file> [<rev>]</p>
+<p><em>git-blame</em> [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] <file> [<rev>]</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -329,6 +329,32 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> </p>
</dd>
<dt>
+-f, --show-name
+</dt>
+<dd>
+<p>
+ Show filename in the original commit. By default
+ filename is shown if there is any line that came from a
+ file with different name, due to rename detection.
+</p>
+</dd>
+<dt>
+-n, --show-number
+</dt>
+<dd>
+<p>
+ Show line number in the original commit (Default: off).
+</p>
+</dd>
+<dt>
+-p, --porcelain
+</dt>
+<dd>
+<p>
+ Show in a format designed for machine consumption.
+</p>
+</dd>
+<dt>
-h, --help
</dt>
<dd>
@@ -338,6 +364,59 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> </dd>
</dl>
</div>
+<h2>THE PORCELAIN FORMAT</h2>
+<div class="sectionbody">
+<p>In this format, each line is output after a header; the
+header at the minumum has the first line which has:</p>
+<ul>
+<li>
+<p>
+40-byte SHA-1 of the commit the line is attributed to;
+</p>
+</li>
+<li>
+<p>
+the line number of the line in the original file;
+</p>
+</li>
+<li>
+<p>
+the line number of the line in the final file;
+</p>
+</li>
+<li>
+<p>
+on a line that starts a group of line from a different
+ commit than the previous one, the number of lines in this
+ 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>
+<li>
+<p>
+author name ("author"), email ("author-mail"), time
+ ("author-time"), and timezone ("author-tz"); similarly
+ for committer.
+</p>
+</li>
+<li>
+<p>
+filename in the commit the line is attributed to.
+</p>
+</li>
+<li>
+<p>
+the first line of the commit log message ("summary").
+</p>
+</li>
+</ul>
+<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>
<h2>SEE ALSO</h2>
<div class="sectionbody">
<p><a href="git-annotate.html">git-annotate(1)</a></p>
@@ -352,7 +431,7 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 03-Oct-2006 08:40:53 UTC
+Last updated 25-Oct-2006 22:55:21 UTC
</div>
</div>
</body>
|