From: Junio C Hamano Date: Wed, 19 Dec 2007 07:33:38 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4-rc0-73-gce85b X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe98605acce79d6dd523796494376802de801530;p=git.git Autogenerated HTML docs for v1.5.4-rc0-73-gce85b --- diff --git a/config.txt b/config.txt index 8a0df5736..ee0884545 100644 --- a/config.txt +++ b/config.txt @@ -476,7 +476,7 @@ fetch.unpackLimit:: format.numbered:: A boolean which can enable sequence numbers in patch subjects. - Seting this option to "auto" will enable it only if there is + Setting this option to "auto" will enable it only if there is more than one patch. See --numbered option in gitlink:git-format-patch[1]. diff --git a/git-config.html b/git-config.html index e0d81feea..fbe3a1152 100644 --- a/git-config.html +++ b/git-config.html @@ -1400,7 +1400,7 @@ format.numbered

A boolean which can enable sequence numbers in patch subjects. - Seting this option to "auto" will enable it only if there is + Setting this option to "auto" will enable it only if there is more than one patch. See --numbered option in git-format-patch(1).

@@ -2126,7 +2126,7 @@ transfer.unpackLimit diff --git a/git-help.html b/git-help.html index 518f2e72f..655608088 100644 --- a/git-help.html +++ b/git-help.html @@ -283,7 +283,7 @@ on the standard output.

printed on the standard output.

If a git command is named, a manual page for that command is brought up. The man program is used by default for this purpose, but this -can be overriden by other options or configuration variables.

+can be overridden by other options or configuration variables.

Note that git --help … is identical as git help … because the former is internally converted into the latter.

@@ -296,7 +296,7 @@ former is internally converted into the latter.

Prints all the available commands on the standard output. This - option superseeds any other option. + option supersedes any other option.

@@ -330,7 +330,7 @@ former is internally converted into the latter.

help.browser, or web.browser if the former is not set. If none of these config variables is set, the git-help--browse helper script (called by git-help) will pick a suitable default.

-

You can explicitly provide a full path to your prefered browser by +

You can explicitly provide a full path to your preferred browser by setting the configuration variable browser.<tool>.path. For example, you can configure the absolute path to firefox by setting browser.firefox.path. Otherwise, git-help--browse assumes the tool @@ -364,7 +364,7 @@ line option:

The help.browser, web.browser and browser.<tool>.path will also -be checked if the web format is choosen (either by command line +be checked if the web format is chosen (either by command line option or configuration variable). See -w|--web in the OPTIONS section above.

Note that these configuration variables should probably be set using @@ -394,7 +394,7 @@ little. Maintenance is done by the git-list <git@vger.kernel.org>.

diff --git a/git-help.txt b/git-help.txt index da3f71850..a8ffcbe78 100644 --- a/git-help.txt +++ b/git-help.txt @@ -21,7 +21,7 @@ printed on the standard output. If a git command is named, a manual page for that command is brought up. The 'man' program is used by default for this purpose, but this -can be overriden by other options or configuration variables. +can be overridden by other options or configuration variables. Note that 'git --help ...' is identical as 'git help ...' because the former is internally converted into the latter. @@ -30,7 +30,7 @@ OPTIONS ------- -a|--all:: Prints all the available commands on the standard output. This - option superseeds any other option. + option supersedes any other option. -i|--info:: Use the 'info' program to display the manual page, instead of @@ -50,7 +50,7 @@ The web browser can be specified using the configuration variable these config variables is set, the 'git-help--browse' helper script (called by 'git-help') will pick a suitable default. + -You can explicitly provide a full path to your prefered browser by +You can explicitly provide a full path to your preferred browser by setting the configuration variable 'browser..path'. For example, you can configure the absolute path to firefox by setting 'browser.firefox.path'. Otherwise, 'git-help--browse' assumes the tool @@ -72,7 +72,7 @@ line option: * "web" or "html" correspond to '-w|--web', The 'help.browser', 'web.browser' and 'browser..path' will also -be checked if the 'web' format is choosen (either by command line +be checked if the 'web' format is chosen (either by command line option or configuration variable). See '-w|--web' in the OPTIONS section above. diff --git a/git-init.html b/git-init.html index bbd44403e..ff906e18c 100644 --- a/git-init.html +++ b/git-init.html @@ -331,7 +331,7 @@ is given:

all (or world or everybody): Same as group, but make the repository readable by all users.

-

By default, the configuration flag receive.denyNonFastforward is enabled +

By default, the configuration flag receive.denyNonFastForwards is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it.

@@ -403,7 +403,7 @@ add all existing file to the index diff --git a/git-init.txt b/git-init.txt index 07484a4fd..e51351dd5 100644 --- a/git-init.txt +++ b/git-init.txt @@ -52,7 +52,7 @@ is given: - 'all' (or 'world' or 'everybody'): Same as 'group', but make the repository readable by all users. -By default, the configuration flag receive.denyNonFastforward is enabled +By default, the configuration flag receive.denyNonFastForwards is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it. diff --git a/git-rev-list.html b/git-rev-list.html index 5c837a7fb..3f9104e33 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -655,7 +655,7 @@ limiting may be applied.

Don't print anything to standard output. This form of - git-rev-list is primarly meant to allow the caller to + git-rev-list is primarily meant to allow the caller to test the exit status to see if a range of objects is fully connected (or not). It is faster than redirecting stdout to /dev/null as the output does not have to be formatted. @@ -1175,7 +1175,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index 989fbf356..a03f9fe5f 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -274,7 +274,7 @@ limiting may be applied. --quiet:: Don't print anything to standard output. This form of - git-rev-list is primarly meant to allow the caller to + git-rev-list is primarily meant to allow the caller to test the exit status to see if a range of objects is fully connected (or not). It is faster than redirecting stdout to /dev/null as the output does not have to be formatted. diff --git a/git-send-email.html b/git-send-email.html index e78ce00f9..3523fbd8f 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -512,7 +512,7 @@ sendemail.identity sendemail.<identity>.<item> will have higher precedence than sendemail.<item>. This is useful to declare multiple SMTP identities and to hoist sensitive authentication information - out of the repository and into the global configuation file. + out of the repository and into the global configuration file.

@@ -616,7 +616,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 659215ac7..f0bd2851d 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -148,7 +148,7 @@ sendemail.identity:: 'sendemail..' will have higher precedence than 'sendemail.'. This is useful to declare multiple SMTP identities and to hoist sensitive authentication information - out of the repository and into the global configuation file. + out of the repository and into the global configuration file. sendemail.aliasesfile:: To avoid typing long email addresses, point this to one or more diff --git a/git.html b/git.html index 23033ebe6..fd7588560 100644 --- a/git.html +++ b/git.html @@ -1870,7 +1870,7 @@ contents of the working tree, and named pointers into that history such as tags and branch heads.

The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up -directory heirarchies; and commits, which each reference a single tree +directory hierarchies; and commits, which each reference a single tree and some number of parent commits.

The commit, equivalent to what other systems call a "changeset" or "version", represents a step in the project's history, and each parent @@ -1886,7 +1886,7 @@ efficiency may later be compressed together into "pack files".

Named pointers called refs mark interesting points in history. A ref may contain the SHA1 name of an object or the name of another ref. Refs with names beginning ref/head/ contain the SHA1 name of the most -recent commit (or "head") of a branch under developement. SHA1 names of +recent commit (or "head") of a branch under development. SHA1 names of tags of interest are stored under ref/tags/. A special ref named HEAD contains the name of the currently checked-out branch.

The index file is initialized with a list of all paths and, for each @@ -1938,7 +1938,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index e0f9a4490..37235b993 100644 --- a/git.txt +++ b/git.txt @@ -502,7 +502,7 @@ as tags and branch heads. The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up -directory heirarchies; and commits, which each reference a single tree +directory hierarchies; and commits, which each reference a single tree and some number of parent commits. The commit, equivalent to what other systems call a "changeset" or @@ -522,7 +522,7 @@ efficiency may later be compressed together into "pack files". Named pointers called refs mark interesting points in history. A ref may contain the SHA1 name of an object or the name of another ref. Refs with names beginning `ref/head/` contain the SHA1 name of the most -recent commit (or "head") of a branch under developement. SHA1 names of +recent commit (or "head") of a branch under development. SHA1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch.