Skip to content

Commit 69a9858

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.5.4.3-365-gc149
1 parent 40f54d3 commit 69a9858

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

git-cherry-pick.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ <h2>OPTIONS</h2>
335335
</dt>
336336
<dd>
337337
<p>
338-
Usually you cannot revert a merge because you do not know which
338+
Usually you cannot cherry-pick a merge because you do not know which
339339
side of the merge should be considered the mainline. This
340340
option specifies the parent number (starting from 1) of
341341
the mainline and allows cherry-pick to replay the change
@@ -375,7 +375,7 @@ <h2>GIT</h2>
375375
</div>
376376
<div id="footer">
377377
<div id="footer-text">
378-
Last updated 21-Jan-2008 02:37:25 UTC
378+
Last updated 01-Mar-2008 18:41:39 UTC
379379
</div>
380380
</div>
381381
</body>

git-cherry-pick.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ OPTIONS
4545
default is not to do `-x` so this option is a no-op.
4646

4747
-m parent-number|--mainline parent-number::
48-
Usually you cannot revert a merge because you do not know which
48+
Usually you cannot cherry-pick a merge because you do not know which
4949
side of the merge should be considered the mainline. This
5050
option specifies the parent number (starting from 1) of
5151
the mainline and allows cherry-pick to replay the change

git-gc.html

Lines changed: 10 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-gc</em> [--prune] [--aggressive] [--auto]</p>
275+
<p><em>git-gc</em> [--prune] [--aggressive] [--auto] [--quiet]</p>
276276
</div>
277277
<h2>DESCRIPTION</h2>
278278
<div class="sectionbody">
@@ -339,6 +339,14 @@ <h2>OPTIONS</h2>
339339
<tt>git-repack</tt>. Setting <tt>gc.autopacklimit</tt> to 0 disables
340340
automatic consolidation of packs.</p>
341341
</dd>
342+
<dt>
343+
--quiet
344+
</dt>
345+
<dd>
346+
<p>
347+
Suppress all progress reports.
348+
</p>
349+
</dd>
342350
</dl>
343351
</div>
344352
<h2>Configuration</h2>
@@ -390,7 +398,7 @@ <h2>GIT</h2>
390398
</div>
391399
<div id="footer">
392400
<div id="footer-text">
393-
Last updated 12-Jan-2008 06:43:55 UTC
401+
Last updated 01-Mar-2008 18:41:39 UTC
394402
</div>
395403
</div>
396404
</body>

git-gc.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ git-gc - Cleanup unnecessary files and optimize the local repository
88

99
SYNOPSIS
1010
--------
11-
'git-gc' [--prune] [--aggressive] [--auto]
11+
'git-gc' [--prune] [--aggressive] [--auto] [--quiet]
1212

1313
DESCRIPTION
1414
-----------
@@ -63,6 +63,9 @@ are consolidated into a single pack by using the `-A` option of
6363
`git-repack`. Setting `gc.autopacklimit` to 0 disables
6464
automatic consolidation of packs.
6565

66+
--quiet::
67+
Suppress all progress reports.
68+
6669
Configuration
6770
-------------
6871

0 commit comments

Comments
 (0)