From: Junio C Hamano Date: Wed, 21 Feb 2007 20:24:10 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0.1-74-g2470 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=118d277c10b5db8daa66617d0e75ac2cf9ff7219;p=git.git Autogenerated HTML docs for v1.5.0.1-74-g2470 --- diff --git a/config.txt b/config.txt index d8e696f4c..f5c846f41 100644 --- a/config.txt +++ b/config.txt @@ -439,10 +439,6 @@ pull.octopus:: pull.twohead:: The default merge strategy to use when pulling a single branch. -remote.fetch:: - The list of remotes which are fetched by "git remote update". - See gitlink:git-remote[1]. - remote..url:: The URL of a remote repository. See gitlink:git-fetch[1] or gitlink:git-push[1]. @@ -455,6 +451,10 @@ remote..push:: The default set of "refspec" for gitlink:git-push[1]. See gitlink:git-push[1]. +remote..skipDefaultUpdate:: + If true, this remote will be skipped by default when updating + using the remote subcommand of gitlink:git-remote[1]. + remote..receivepack:: The default program to execute on the remote side when pushing. See option \--exec of gitlink:git-push[1]. @@ -463,6 +463,10 @@ remote..uploadpack:: The default program to execute on the remote side when fetching. See option \--exec of gitlink:git-fetch-pack[1]. +remotes.:: + The list of remotes which are fetched by "git remote update + ". See gitlink:git-remote[1]. + repack.usedeltabaseoffset:: Allow gitlink:git-repack[1] to create packs that uses delta-base offset. Defaults to false. diff --git a/git-config.html b/git-config.html index 719a4dfed..7ea610cc5 100644 --- a/git-config.html +++ b/git-config.html @@ -1232,15 +1232,6 @@ pull.twohead

-remote.fetch -
-
-

- The list of remotes which are fetched by "git remote update". - See git-remote(1). -

-
-
remote.<name>.url
@@ -1268,6 +1259,15 @@ remote.<name>.push

+remote.<name>.skipDefaultUpdate +
+
+

+ If true, this remote will be skipped by default when updating + using the remote subcommand of git-remote(1). +

+
+
remote.<name>.receivepack
@@ -1286,6 +1286,15 @@ remote.<name>.uploadpack

+remotes.<group> +
+
+

+ The list of remotes which are fetched by "git remote update + <group>". See git-remote(1). +

+
+
repack.usedeltabaseoffset
@@ -1428,7 +1437,7 @@ transfer.unpackLimit diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index 84a16d070..f72df3e16 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -272,7 +272,7 @@ git-cvsexportcommit(1) Manual Page

SYNOPSIS

-

git-cvsexportcommit [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

+

git-cvsexportcommit [-h] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

DESCRIPTION

@@ -318,6 +318,16 @@ should the changeset be done against.

+-d +
+
+

+ Set an alternative CVSROOT to use. This corresponds to the CVS + -d parameter. Usually users will not want to set this, except + if using CVS in an asymmetric fashion. +

+
+
-f
@@ -394,7 +404,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 27d531b88..555b8234f 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -8,7 +8,7 @@ git-cvsexportcommit - Export a single commit to a CVS checkout SYNOPSIS -------- -'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID +'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID DESCRIPTION @@ -43,6 +43,11 @@ OPTIONS Add authorship information. Adds Author line, and Committer (if different from Author) to the message. +-d:: + Set an alternative CVSROOT to use. This corresponds to the CVS + -d parameter. Usually users will not want to set this, except + if using CVS in an asymmetric fashion. + -f:: Force the merge even if the files are not up to date. diff --git a/git-remote.html b/git-remote.html index b4c767fcb..e7a8a730e 100644 --- a/git-remote.html +++ b/git-remote.html @@ -277,7 +277,7 @@ git-remote(1) Manual Page git-remote add <name> <url> git-remote show <name> git-remote prune <name> -git-remote update +git-remote update [group]

DESCRIPTION

@@ -322,9 +322,12 @@ referenced by <name>, but are still locally available in

-Fetch updates for the remotes in the repository. By default all remotes -are updated, but this can be configured via the configuration parameter -remote.fetch. (See git-config(1)). +Fetch updates for a named set of remotes in the repository as defined by +remotes.<group>. If a named group is not specified on the command line, +the configuration parameter remotes.default will get used; if +remotes.default is not defined, all remotes which do not the +configuration parameter remote.<name>.skipDefaultUpdate set to true will +be updated. (See git-config(1)).

@@ -378,7 +381,7 @@ $ git checkout -b nfs linux-nfs/master diff --git a/git-remote.txt b/git-remote.txt index 06ba2e6f2..250761f97 100644 --- a/git-remote.txt +++ b/git-remote.txt @@ -13,7 +13,7 @@ SYNOPSIS 'git-remote' add 'git-remote' show 'git-remote' prune -'git-remote' update +'git-remote' update [group] DESCRIPTION ----------- @@ -46,9 +46,12 @@ referenced by , but are still locally available in 'update':: -Fetch updates for the remotes in the repository. By default all remotes -are updated, but this can be configured via the configuration parameter -'remote.fetch'. (See gitlink:git-config[1]). +Fetch updates for a named set of remotes in the repository as defined by +remotes.. If a named group is not specified on the command line, +the configuration parameter remotes.default will get used; if +remotes.default is not defined, all remotes which do not the +configuration parameter remote..skipDefaultUpdate set to true will +be updated. (See gitlink:git-config[1]). DISCUSSION diff --git a/git.html b/git.html index 9163c254c..41e4f9f1b 100644 --- a/git.html +++ b/git.html @@ -2290,7 +2290,7 @@ contributors on the git-list <git@vger.kernel.org>.