Skip to content

Commit ff4b431

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.4.3.3-geb15
1 parent 249572f commit ff4b431

8 files changed

Lines changed: 804 additions & 9 deletions

File tree

‎git-blame.html‎

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ <h2>NAME</h2>
272272
</div>
273273
<h2>SYNOPSIS</h2>
274274
<div class="sectionbody">
275-
<p><em>git-blame</em> [-c] [-l] [-t] [-S &lt;revs-file&gt;] [--] &lt;file&gt; [&lt;rev&gt;]</p>
275+
<p><em>git-blame</em> [-c] [-l] [-t] [-f] [-n] [-p] [-S &lt;revs-file&gt;] [--] &lt;file&gt; [&lt;rev&gt;]</p>
276276
</div>
277277
<h2>DESCRIPTION</h2>
278278
<div class="sectionbody">
@@ -329,6 +329,32 @@ <h2>OPTIONS</h2>
329329
</p>
330330
</dd>
331331
<dt>
332+
-f, --show-name
333+
</dt>
334+
<dd>
335+
<p>
336+
Show filename in the original commit. By default
337+
filename is shown if there is any line that came from a
338+
file with different name, due to rename detection.
339+
</p>
340+
</dd>
341+
<dt>
342+
-n, --show-number
343+
</dt>
344+
<dd>
345+
<p>
346+
Show line number in the original commit (Default: off).
347+
</p>
348+
</dd>
349+
<dt>
350+
-p, --porcelain
351+
</dt>
352+
<dd>
353+
<p>
354+
Show in a format designed for machine consumption.
355+
</p>
356+
</dd>
357+
<dt>
332358
-h, --help
333359
</dt>
334360
<dd>
@@ -338,6 +364,59 @@ <h2>OPTIONS</h2>
338364
</dd>
339365
</dl>
340366
</div>
367+
<h2>THE PORCELAIN FORMAT</h2>
368+
<div class="sectionbody">
369+
<p>In this format, each line is output after a header; the
370+
header at the minumum has the first line which has:</p>
371+
<ul>
372+
<li>
373+
<p>
374+
40-byte SHA-1 of the commit the line is attributed to;
375+
</p>
376+
</li>
377+
<li>
378+
<p>
379+
the line number of the line in the original file;
380+
</p>
381+
</li>
382+
<li>
383+
<p>
384+
the line number of the line in the final file;
385+
</p>
386+
</li>
387+
<li>
388+
<p>
389+
on a line that starts a group of line from a different
390+
commit than the previous one, the number of lines in this
391+
group. On subsequent lines this field is absent.
392+
</p>
393+
</li>
394+
</ul>
395+
<p>This header line is followed by the following information
396+
at least once for each commit:</p>
397+
<ul>
398+
<li>
399+
<p>
400+
author name ("author"), email ("author-mail"), time
401+
("author-time"), and timezone ("author-tz"); similarly
402+
for committer.
403+
</p>
404+
</li>
405+
<li>
406+
<p>
407+
filename in the commit the line is attributed to.
408+
</p>
409+
</li>
410+
<li>
411+
<p>
412+
the first line of the commit log message ("summary").
413+
</p>
414+
</li>
415+
</ul>
416+
<p>The contents of the actual line is output after the above
417+
header, prefixed by a TAB. This is to allow adding more
418+
header elements later.</p>
419+
</div>
341420
<h2>SEE ALSO</h2>
342421
<div class="sectionbody">
343422
<p><a href="git-annotate.html">git-annotate(1)</a></p>
@@ -352,7 +431,7 @@ <h2>GIT</h2>
352431
</div>
353432
<div id="footer">
354433
<div id="footer-text">
355-
Last updated 03-Oct-2006 08:40:53 UTC
434+
Last updated 25-Oct-2006 22:55:21 UTC
356435
</div>
357436
</div>
358437
</body>

‎git-blame.txt‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git-blame - Show what revision and author last modified each line of a file
77

88
SYNOPSIS
99
--------
10-
'git-blame' [-c] [-l] [-t] [-S <revs-file>] [--] <file> [<rev>]
10+
'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] <file> [<rev>]
1111

1212
DESCRIPTION
1313
-----------
@@ -45,10 +45,47 @@ OPTIONS
4545
-S, --rev-file <revs-file>::
4646
Use revs from revs-file instead of calling gitlink:git-rev-list[1].
4747

48+
-f, --show-name::
49+
Show filename in the original commit. By default
50+
filename is shown if there is any line that came from a
51+
file with different name, due to rename detection.
52+
53+
-n, --show-number::
54+
Show line number in the original commit (Default: off).
55+
56+
-p, --porcelain::
57+
Show in a format designed for machine consumption.
58+
4859
-h, --help::
4960
Show help message.
5061

5162

63+
THE PORCELAIN FORMAT
64+
--------------------
65+
66+
In this format, each line is output after a header; the
67+
header at the minumum has the first line which has:
68+
69+
- 40-byte SHA-1 of the commit the line is attributed to;
70+
- the line number of the line in the original file;
71+
- the line number of the line in the final file;
72+
- on a line that starts a group of line from a different
73+
commit than the previous one, the number of lines in this
74+
group. On subsequent lines this field is absent.
75+
76+
This header line is followed by the following information
77+
at least once for each commit:
78+
79+
- author name ("author"), email ("author-mail"), time
80+
("author-time"), and timezone ("author-tz"); similarly
81+
for committer.
82+
- filename in the commit the line is attributed to.
83+
- the first line of the commit log message ("summary").
84+
85+
The contents of the actual line is output after the above
86+
header, prefixed by a TAB. This is to allow adding more
87+
header elements later.
88+
5289
SEE ALSO
5390
--------
5491
gitlink:git-annotate[1]

‎git-cherry.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,9 @@ <h2>DESCRIPTION</h2>
278278
<div class="sectionbody">
279279
<p>The changeset (or "diff") of each commit between the fork-point and &lt;head&gt;
280280
is compared against each commit between the fork-point and &lt;upstream&gt;.</p>
281-
<p>Every commit with a changeset that doesn't exist in the other branch
282-
has its id (sha1) reported, prefixed by a symbol. Those existing only
281+
<p>Every commit that doesn't exist in the &lt;upstream&gt; branch
282+
has its id (sha1) reported, prefixed by a symbol. The ones that have
283+
equivalent change already
283284
in the &lt;upstream&gt; branch are prefixed with a minus (-) sign, and those
284285
that only exist in the &lt;head&gt; branch are prefixed with a plus (+) symbol.</p>
285286
<p>Because git-cherry compares the changeset rather than the commit id
@@ -331,7 +332,7 @@ <h2>GIT</h2>
331332
</div>
332333
<div id="footer">
333334
<div id="footer-text">
334-
Last updated 03-Oct-2006 08:40:56 UTC
335+
Last updated 25-Oct-2006 22:55:22 UTC
335336
</div>
336337
</div>
337338
</body>

‎git-cherry.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ DESCRIPTION
1414
The changeset (or "diff") of each commit between the fork-point and <head>
1515
is compared against each commit between the fork-point and <upstream>.
1616

17-
Every commit with a changeset that doesn't exist in the other branch
18-
has its id (sha1) reported, prefixed by a symbol. Those existing only
17+
Every commit that doesn't exist in the <upstream> branch
18+
has its id (sha1) reported, prefixed by a symbol. The ones that have
19+
equivalent change already
1920
in the <upstream> branch are prefixed with a minus (-) sign, and those
2021
that only exist in the <head> branch are prefixed with a plus (+) symbol.
2122

0 commit comments

Comments
 (0)