Skip to content

Commit d2179ef

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.7.3.2-90-gd4c43
1 parent 7f9fa86 commit d2179ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+332
-326
lines changed

‎RelNotes/1.7.3.2.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Git v1.7.3.2 Release Notes
2+
==========================
3+
4+
This is primarily to push out many documentation fixes accumulated since
5+
the 1.7.3.1 release.

‎diff-options.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ endif::git-format-patch[]
4848
--patience::
4949
Generate a diff using the "patience diff" algorithm.
5050

51-
--stat[=width[,name-width]]::
51+
--stat[=<width>[,<name-width>]]::
5252
Generate a diffstat. You can override the default
53-
output width for 80-column terminal by `--stat=width`.
53+
output width for 80-column terminal by `--stat=<width>`.
5454
The width of the filename part can be controlled by
5555
giving another width to it separated by a comma.
5656

@@ -66,14 +66,14 @@ endif::git-format-patch[]
6666
number of modified files, as well as number of added and deleted
6767
lines.
6868

69-
--dirstat[=limit]::
69+
--dirstat[=<limit>]::
7070
Output the distribution of relative amount of changes (number of lines added or
7171
removed) for each sub-directory. Directories with changes below
7272
a cut-off percent (3% by default) are not shown. The cut-off percent
73-
can be set with `--dirstat=limit`. Changes in a child directory is not
73+
can be set with `--dirstat=<limit>`. Changes in a child directory are not
7474
counted for the parent directory, unless `--cumulative` is used.
7575

76-
--dirstat-by-file[=limit]::
76+
--dirstat-by-file[=<limit>]::
7777
Same as `--dirstat`, but counts changed files instead of lines.
7878

7979
--summary::
@@ -248,13 +248,13 @@ endif::git-log[]
248248
If `n` is specified, it has the same meaning as for `-M<n>`.
249249

250250
ifndef::git-format-patch[]
251-
--diff-filter=[ACDMRTUXB*]::
251+
--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
252252
Select only files that are Added (`A`), Copied (`C`),
253253
Deleted (`D`), Modified (`M`), Renamed (`R`), have their
254254
type (i.e. regular file, symlink, submodule, ...) changed (`T`),
255255
are Unmerged (`U`), are
256256
Unknown (`X`), or have had their pairing Broken (`B`).
257-
Any combination of the filter characters may be used.
257+
Any combination of the filter characters (including none) can be used.
258258
When `*` (All-or-none) is added to the combination, all
259259
paths are selected if there is any file that matches
260260
other criteria in the comparison; if there is no file

‎git-am.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ <h2>SYNOPSIS</h2>
326326
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
327327
[--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
328328
[--reject] [-q | --quiet] [--scissors | --no-scissors]
329-
[&lt;mbox&gt; | &lt;Maildir&gt;&#8230;]
329+
[(&lt;mbox&gt; | &lt;Maildir&gt;)&#8230;]
330330
<em>git am</em> (--continue | --skip | --abort)</div></div>
331331
</div>
332332
<h2 id="_description">DESCRIPTION</h2>
@@ -339,7 +339,7 @@ <h2 id="_options">OPTIONS</h2>
339339
<div class="sectionbody">
340340
<div class="vlist"><dl>
341341
<dt>
342-
&lt;mbox&gt;|&lt;Maildir&gt;&#8230;
342+
(&lt;mbox&gt;|&lt;Maildir&gt;)&#8230;
343343
</dt>
344344
<dd>
345345
<p>
@@ -653,7 +653,7 @@ <h2 id="_git">GIT</h2>
653653
</div>
654654
<div id="footer">
655655
<div id="footer-text">
656-
Last updated 2010-09-18 23:56:32 UTC
656+
Last updated 2010-10-22 04:11:02 UTC
657657
</div>
658658
</div>
659659
</body>

‎git-am.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SYNOPSIS
1414
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
1515
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
1616
[--reject] [-q | --quiet] [--scissors | --no-scissors]
17-
[<mbox> | <Maildir>...]
17+
[(<mbox> | <Maildir>)...]
1818
'git am' (--continue | --skip | --abort)
1919

2020
DESCRIPTION
@@ -25,7 +25,7 @@ current branch.
2525

2626
OPTIONS
2727
-------
28-
<mbox>|<Maildir>...::
28+
(<mbox>|<Maildir>)...::
2929
The list of mailbox files to read patches from. If you do not
3030
supply this argument, the command reads from the standard input.
3131
If you supply directories, they will be treated as Maildirs.

‎git-apply.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,10 @@ <h2>SYNOPSIS</h2>
324324
<div class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index]
325325
[--apply] [--no-add] [--build-fake-ancestor=&lt;file&gt;] [-R | --reverse]
326326
[--allow-binary-replacement | --binary] [--reject] [-z]
327-
[-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
327+
[-p&lt;n&gt;] [-C&lt;n&gt;] [--inaccurate-eof] [--recount] [--cached]
328328
[--ignore-space-change | --ignore-whitespace ]
329-
[--whitespace=&lt;nowarn|warn|fix|error|error-all&gt;]
330-
[--exclude=PATH] [--include=PATH] [--directory=&lt;root&gt;]
329+
[--whitespace=(nowarn|warn|fix|error|error-all)]
330+
[--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--directory=&lt;root&gt;]
331331
[--verbose] [&lt;patch&gt;&#8230;]</div></div>
332332
</div>
333333
<h2 id="_description">DESCRIPTION</h2>
@@ -736,7 +736,7 @@ <h2 id="_git">GIT</h2>
736736
</div>
737737
<div id="footer">
738738
<div id="footer-text">
739-
Last updated 2010-09-18 23:56:33 UTC
739+
Last updated 2010-10-22 04:11:02 UTC
740740
</div>
741741
</div>
742742
</body>

‎git-apply.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ SYNOPSIS
1212
'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
1313
[--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
1414
[--allow-binary-replacement | --binary] [--reject] [-z]
15-
[-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
15+
[-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
1616
[--ignore-space-change | --ignore-whitespace ]
17-
[--whitespace=<nowarn|warn|fix|error|error-all>]
18-
[--exclude=PATH] [--include=PATH] [--directory=<root>]
17+
[--whitespace=(nowarn|warn|fix|error|error-all)]
18+
[--exclude=<path>] [--include=<path>] [--directory=<root>]
1919
[--verbose] [<patch>...]
2020

2121
DESCRIPTION

‎git-archive.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ <h2>SYNOPSIS</h2>
324324
<div class="content"><em>git archive</em> [--format=&lt;fmt&gt;] [--list] [--prefix=&lt;prefix&gt;/] [&lt;extra&gt;]
325325
[-o | --output=&lt;file&gt;] [--worktree-attributes]
326326
[--remote=&lt;repo&gt; [--exec=&lt;git-upload-archive&gt;]] &lt;tree-ish&gt;
327-
[path&#8230;]</div></div>
327+
[&lt;path&gt;&#8230;]</div></div>
328328
</div>
329329
<h2 id="_description">DESCRIPTION</h2>
330330
<div class="sectionbody">
@@ -441,7 +441,7 @@ <h2 id="_options">OPTIONS</h2>
441441
</p>
442442
</dd>
443443
<dt>
444-
path
444+
&lt;path&gt;
445445
</dt>
446446
<dd>
447447
<p>
@@ -592,7 +592,7 @@ <h2 id="_git">GIT</h2>
592592
</div>
593593
<div id="footer">
594594
<div id="footer-text">
595-
Last updated 2010-09-18 23:56:34 UTC
595+
Last updated 2010-10-22 04:11:02 UTC
596596
</div>
597597
</div>
598598
</body>

‎git-archive.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SYNOPSIS
1212
'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
1313
[-o | --output=<file>] [--worktree-attributes]
1414
[--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
15-
[path...]
15+
[<path>...]
1616

1717
DESCRIPTION
1818
-----------
@@ -73,7 +73,7 @@ OPTIONS
7373
<tree-ish>::
7474
The tree or commit to produce an archive for.
7575

76-
path::
76+
<path>::
7777
Without an optional path parameter, all files and subdirectories
7878
of the current working directory are included in the archive.
7979
If one or more paths are specified, only these are included.

‎git-bundle.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ <h2>SYNOPSIS</h2>
323323
<div class="verseblock">
324324
<div class="content"><em>git bundle</em> create &lt;file&gt; &lt;git-rev-list-args&gt;
325325
<em>git bundle</em> verify &lt;file&gt;
326-
<em>git bundle</em> list-heads &lt;file&gt; [refname&#8230;]
327-
<em>git bundle</em> unbundle &lt;file&gt; [refname&#8230;]</div></div>
326+
<em>git bundle</em> list-heads &lt;file&gt; [&lt;refname&gt;&#8230;]
327+
<em>git bundle</em> unbundle &lt;file&gt; [&lt;refname&gt;&#8230;]</div></div>
328328
</div>
329329
<h2 id="_description">DESCRIPTION</h2>
330330
<div class="sectionbody">
@@ -404,7 +404,7 @@ <h2 id="_options">OPTIONS</h2>
404404
</p>
405405
</dd>
406406
<dt>
407-
[refname&#8230;]
407+
[&lt;refname&gt;&#8230;]
408408
</dt>
409409
<dd>
410410
<p>
@@ -536,7 +536,7 @@ <h2 id="_git">GIT</h2>
536536
</div>
537537
<div id="footer">
538538
<div id="footer-text">
539-
Last updated 2010-09-18 23:56:35 UTC
539+
Last updated 2010-10-22 04:11:02 UTC
540540
</div>
541541
</div>
542542
</body>

‎git-bundle.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ SYNOPSIS
1111
[verse]
1212
'git bundle' create <file> <git-rev-list-args>
1313
'git bundle' verify <file>
14-
'git bundle' list-heads <file> [refname...]
15-
'git bundle' unbundle <file> [refname...]
14+
'git bundle' list-heads <file> [<refname>...]
15+
'git bundle' unbundle <file> [<refname>...]
1616

1717
DESCRIPTION
1818
-----------
@@ -68,7 +68,7 @@ unbundle <file>::
6868
packaged.
6969

7070

71-
[refname...]::
71+
[<refname>...]::
7272
A list of references used to limit the references reported as
7373
available. This is principally of use to 'git fetch', which
7474
expects to receive only those references asked for and not

0 commit comments

Comments
 (0)