From: Junio C Hamano Date: Sat, 1 Mar 2008 18:42:18 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4.3-365-gc149 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69a98586dace45994f1eeeee63cf19d056bfc561;p=git.git Autogenerated HTML docs for v1.5.4.3-365-gc149 --- diff --git a/git-cherry-pick.html b/git-cherry-pick.html index e82deb9d6..fe88297cb 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -335,7 +335,7 @@ modifications from the HEAD commit).

- Usually you cannot revert a merge because you do not know which + Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change @@ -375,7 +375,7 @@ effect to your working tree in a row.

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 877ab66ef..f0beb412e 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -45,7 +45,7 @@ OPTIONS default is not to do `-x` so this option is a no-op. -m parent-number|--mainline parent-number:: - Usually you cannot revert a merge because you do not know which + Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change diff --git a/git-gc.html b/git-gc.html index 897be72a6..221881655 100644 --- a/git-gc.html +++ b/git-gc.html @@ -272,7 +272,7 @@ git-gc(1) Manual Page

SYNOPSIS

-

git-gc [--prune] [--aggressive] [--auto]

+

git-gc [--prune] [--aggressive] [--auto] [--quiet]

DESCRIPTION

@@ -339,6 +339,14 @@ are consolidated into a single pack by using the -A option of git-repack. Setting gc.autopacklimit to 0 disables automatic consolidation of packs.

+
+--quiet +
+
+

+ Suppress all progress reports. +

+

Configuration

@@ -390,7 +398,7 @@ more details. This defaults to 10.

diff --git a/git-gc.txt b/git-gc.txt index 4b2dfefa6..2e7be916a 100644 --- a/git-gc.txt +++ b/git-gc.txt @@ -8,7 +8,7 @@ git-gc - Cleanup unnecessary files and optimize the local repository SYNOPSIS -------- -'git-gc' [--prune] [--aggressive] [--auto] +'git-gc' [--prune] [--aggressive] [--auto] [--quiet] DESCRIPTION ----------- @@ -63,6 +63,9 @@ are consolidated into a single pack by using the `-A` option of `git-repack`. Setting `gc.autopacklimit` to 0 disables automatic consolidation of packs. +--quiet:: + Suppress all progress reports. + Configuration -------------