From 51c2ab075b2b9f9af2734cb54753534bbda88696 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 9 Jul 2006 20:38:54 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.1-gff4c8 --- cvs-migration.html | 4 ++-- cvs-migration.txt | 2 +- git-cvsexportcommit.html | 4 ++-- git-cvsexportcommit.txt | 2 +- git-diff-files.html | 4 ++-- git-diff-files.txt | 2 +- git-diff.html | 20 ++++++++++---------- git-diff.txt | 18 +++++++++--------- git-fetch.html | 4 ++-- git-init-db.html | 4 ++-- git-init-db.txt | 2 +- git-mailsplit.html | 4 ++-- git-mailsplit.txt | 2 +- git-merge.html | 4 ++-- git-merge.txt | 2 +- git-p4import.html | 6 +++--- git-p4import.txt | 4 ++-- git-pack-redundant.html | 4 ++-- git-pack-redundant.txt | 2 +- git-pull.html | 4 ++-- git-push.html | 6 +++--- git-push.txt | 2 +- git-repo-config.html | 6 +++--- git-repo-config.txt | 4 ++-- git-rev-list.html | 4 ++-- git-rev-list.txt | 2 +- git-tools.html | 4 ++-- git-tools.txt | 2 +- git-upload-tar.html | 4 ++-- git-upload-tar.txt | 2 +- git.html | 4 ++-- git.txt | 2 +- glossary.html | 4 ++-- glossary.txt | 2 +- howto-index.html | 2 +- howto/isolate-bugs-with-bisect.txt | 2 +- howto/rebase-from-internal-branch.txt | 2 +- urls.txt | 2 +- 38 files changed, 77 insertions(+), 77 deletions(-) diff --git a/cvs-migration.html b/cvs-migration.html index 63e5d1ec9..7958e0284 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -357,7 +357,7 @@ easy way to do this is to give all the team members ssh access to the machine where the repository is hosted. If you don't want to give them a full shell on the machine, there is a restricted shell which only allows users to do git pushes and pulls; see git-shell(1).

-

Put all the committers should in the same group, and make the repository +

Put all the committers in the same group, and make the repository writable by that group:

@@ -579,7 +579,7 @@ that contain this changed "if" statement:

diff --git a/cvs-migration.txt b/cvs-migration.txt index 1fbca8314..d2b0bd38d 100644 --- a/cvs-migration.txt +++ b/cvs-migration.txt @@ -93,7 +93,7 @@ machine where the repository is hosted. If you don't want to give them a full shell on the machine, there is a restricted shell which only allows users to do git pushes and pulls; see gitlink:git-shell[1]. -Put all the committers should in the same group, and make the repository +Put all the committers in the same group, and make the repository writable by that group: ------------------------------------------------ diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index 70e37cde2..6feffb1db 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -272,7 +272,7 @@ git-cvsexportcommit(1) Manual Page

SYNOPSIS

-

git-cvsexportcommmit [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

+

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

DESCRIPTION

@@ -377,7 +377,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 56bd3e517..27ac72d98 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -8,7 +8,7 @@ git-cvsexportcommit - Export a commit to a CVS checkout SYNOPSIS -------- -'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID +'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID DESCRIPTION diff --git a/git-diff-files.html b/git-diff-files.html index 44df9c646..aa0eb8fe4 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -539,7 +539,7 @@ omit diff output for unmerged entries and just show "Unmerged".

- Remain silent even on nonexisting files + Remain silent even on nonexistent files

@@ -863,7 +863,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-files.txt b/git-diff-files.txt index 481b8b3aa..7248b35d9 100644 --- a/git-diff-files.txt +++ b/git-diff-files.txt @@ -37,7 +37,7 @@ omit diff output for unmerged entries and just show "Unmerged". commit with these flags. -q:: - Remain silent even on nonexisting files + Remain silent even on nonexistent files Output format ------------- diff --git a/git-diff.html b/git-diff.html index 6a4b17527..64d465cdb 100644 --- a/git-diff.html +++ b/git-diff.html @@ -272,32 +272,32 @@ git-diff(1) Manual Page

SYNOPSIS

-

git-diff [ --diff-options ] <ent>{0,2} [<path>…]

+

git-diff [ --diff-options ] <tree-ish>{0,2} [<path>…]

DESCRIPTION

-

Show changes between two ents, an ent and the working tree, an -ent and the index file, or the index file and the working tree. +

Show changes between two trees, a tree and the working tree, a +tree and the index file, or the index file and the working tree. The combination of what is compared with what is determined by -the number of ents given to the command.

+the number of trees given to the command.

diff --git a/git-diff.txt b/git-diff.txt index 7ab208037..228c4d95b 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -8,24 +8,24 @@ git-diff - Show changes between commits, commit and working tree, etc SYNOPSIS -------- -'git-diff' [ --diff-options ] {0,2} [...] +'git-diff' [ --diff-options ] {0,2} [...] DESCRIPTION ----------- -Show changes between two ents, an ent and the working tree, an -ent and the index file, or the index file and the working tree. +Show changes between two trees, a tree and the working tree, a +tree and the index file, or the index file and the working tree. The combination of what is compared with what is determined by -the number of ents given to the command. +the number of trees given to the command. -* When no is given, the working tree and the index - file is compared, using `git-diff-files`. +* When no is given, the working tree and the index + file are compared, using `git-diff-files`. -* When one is given, the working tree and the named - tree is compared, using `git-diff-index`. The option +* When one is given, the working tree and the named + tree are compared, using `git-diff-index`. The option `--cached` can be given to compare the index file and the named tree. -* When two s are given, these two trees are compared +* When two s are given, these two trees are compared using `git-diff-tree`. OPTIONS diff --git a/git-fetch.html b/git-fetch.html index cdf4a1e27..af2275bf1 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -565,7 +565,7 @@ Pull: <refspec> <repository> without <refspec> parameters on the command line, <refspec> specified on Push: lines or Pull: lines are used for git-push and git-fetch/git-pull, -respectively. Multiple Push: and and Pull: lines may +respectively. Multiple Push: and Pull: lines may be specified for additional branch mappings.

The name of a file in $GIT_DIR/branches directory can be specified as an older notation short-hand; the named @@ -606,7 +606,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-init-db.html b/git-init-db.html index 67e56214e..c87bbbc7a 100644 --- a/git-init-db.html +++ b/git-init-db.html @@ -300,7 +300,7 @@ git-init-db(1) Manual Page

This command creates an empty git repository - basically a .git directory with subdirectories for objects, refs/heads, refs/tags, and -templated files. +template files. An initial HEAD file that references the HEAD of the master branch is also created.

If --template=<template_directory> is specified, <template_directory> @@ -363,7 +363,7 @@ add all existing file to the index

diff --git a/git-init-db.txt b/git-init-db.txt index 8a150d861..0a4fc14b9 100644 --- a/git-init-db.txt +++ b/git-init-db.txt @@ -25,7 +25,7 @@ DESCRIPTION ----------- This command creates an empty git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and -templated files. +template files. An initial `HEAD` file that references the HEAD of the master branch is also created. diff --git a/git-mailsplit.html b/git-mailsplit.html index 3fe71ec46..933264f60 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -305,7 +305,7 @@ directory so you can process them further from there.

If any file doesn't begin with a From line, assume it is a - single mail message instead of signalling error. + single mail message instead of signaling error.

@@ -344,7 +344,7 @@ and Junio C Hamano <junkio@cox.net>

diff --git a/git-mailsplit.txt b/git-mailsplit.txt index 209e36bac..5a17801f6 100644 --- a/git-mailsplit.txt +++ b/git-mailsplit.txt @@ -25,7 +25,7 @@ OPTIONS -b:: If any file doesn't begin with a From line, assume it is a - single mail message instead of signalling error. + single mail message instead of signaling error. -d:: Instead of the default 4 digits with leading zeros, diff --git a/git-merge.html b/git-merge.html index 45a341fa8..6e39fe6ea 100644 --- a/git-merge.html +++ b/git-merge.html @@ -459,7 +459,7 @@ what it means for a path to "interfere with the merge". And if your local modifications interfere with the merge, again, it stops before touching anything.

So in the above two "failed merge" case, you do not have to -worry about lossage of data --- you simply were not ready to do +worry about loss of data --- you simply were not ready to do a merge, so no merge happened at all. You may want to finish whatever you were in the middle of doing, and retry the same pull after you are done and ready.

@@ -567,7 +567,7 @@ Resolve the conflicts. git-diff would report only the diff --git a/git-merge.txt b/git-merge.txt index 4ce799b52..bebf30ad3 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -83,7 +83,7 @@ your local modifications interfere with the merge, again, it stops before touching anything. So in the above two "failed merge" case, you do not have to -worry about lossage of data --- you simply were not ready to do +worry about loss of data --- you simply were not ready to do a merge, so no merge happened at all. You may want to finish whatever you were in the middle of doing, and retry the same pull after you are done and ready. diff --git a/git-p4import.html b/git-p4import.html index dac9a2c75..85afe6c02 100644 --- a/git-p4import.html +++ b/git-p4import.html @@ -427,7 +427,7 @@ one per "view" instead of listing the actual directory.

A git tag of the form p4/xx is created for every change imported from the Perforce repository where xx is the Perforce changeset number. Therefore after the import you can use git to access any commit by its -Perforce number, eg. git show p4/327.

+Perforce number, e.g. git show p4/327.

The tag associated with the HEAD commit is also how git-p4import determines if there are new changes to incrementally import from the Perforce repository.

@@ -439,7 +439,7 @@ may delete the tags.

Notes

-

You can interrupt the import (eg. ctrl-c) at any time and restart it +

You can interrupt the import (e.g. ctrl-c) at any time and restart it without worry.

Author information is automatically determined by querying the Perforce "users" table using the id associated with each change. @@ -461,7 +461,7 @@ of mappings with each line containing one mapping in the format:

diff --git a/git-p4import.txt b/git-p4import.txt index 0858e5efb..ee9e8fa90 100644 --- a/git-p4import.txt +++ b/git-p4import.txt @@ -128,7 +128,7 @@ Tags A git tag of the form p4/xx is created for every change imported from the Perforce repository where xx is the Perforce changeset number. Therefore after the import you can use git to access any commit by its -Perforce number, eg. git show p4/327. +Perforce number, e.g. git show p4/327. The tag associated with the HEAD commit is also how `git-p4import` determines if there are new changes to incrementally import from the @@ -143,7 +143,7 @@ may delete the tags. Notes ----- -You can interrupt the import (eg. ctrl-c) at any time and restart it +You can interrupt the import (e.g. ctrl-c) at any time and restart it without worry. Author information is automatically determined by querying the diff --git a/git-pack-redundant.html b/git-pack-redundant.html index c9ea3364b..a32b9848a 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -293,7 +293,7 @@ objects.

- Processes all packs. Any filenames on the commandline are ignored. + Processes all packs. Any filenames on the command line are ignored.

@@ -335,7 +335,7 @@ objects.

diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt index 8fb065943..7d54b17e3 100644 --- a/git-pack-redundant.txt +++ b/git-pack-redundant.txt @@ -29,7 +29,7 @@ OPTIONS --all:: - Processes all packs. Any filenames on the commandline are ignored. + Processes all packs. Any filenames on the command line are ignored. --alt-odb:: Don't require objects present in packs from alternate object diff --git a/git-pull.html b/git-pull.html index 4f99c57f8..edff642ff 100644 --- a/git-pull.html +++ b/git-pull.html @@ -609,7 +609,7 @@ Pull: <refspec> <repository> without <refspec> parameters on the command line, <refspec> specified on Push: lines or Pull: lines are used for git-push and git-fetch/git-pull, -respectively. Multiple Push: and and Pull: lines may +respectively. Multiple Push: and Pull: lines may be specified for additional branch mappings.

The name of a file in $GIT_DIR/branches directory can be specified as an older notation short-hand; the named @@ -808,7 +808,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-push.html b/git-push.html index 68be21fc5..ca710d34c 100644 --- a/git-push.html +++ b/git-push.html @@ -358,7 +358,7 @@ A parameter <ref> without a colon is equivalent to

Usually, the command refuses to update a remote ref that is - not a descendent of the local ref used to overwrite it. + not a descendant of the local ref used to overwrite it. This flag disables the check. This can cause the remote repository to lose commits; use it with care.

@@ -465,7 +465,7 @@ Pull: <refspec> <repository> without <refspec> parameters on the command line, <refspec> specified on Push: lines or Pull: lines are used for git-push and git-fetch/git-pull, -respectively. Multiple Push: and and Pull: lines may +respectively. Multiple Push: and Pull: lines may be specified for additional branch mappings.

The name of a file in $GIT_DIR/branches directory can be specified as an older notation short-hand; the named @@ -501,7 +501,7 @@ Pull: refs/heads/<head>:<remote>

diff --git a/git-push.txt b/git-push.txt index d5b5ca167..56afd64f4 100644 --- a/git-push.txt +++ b/git-push.txt @@ -67,7 +67,7 @@ Some short-cut notations are also supported. -f, \--force:: Usually, the command refuses to update a remote ref that is - not a descendent of the local ref used to overwrite it. + not a descendant of the local ref used to overwrite it. This flag disables the check. This can cause the remote repository to lose commits; use it with care. diff --git a/git-repo-config.html b/git-repo-config.html index e0b125ecf..174f68b1b 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -456,8 +456,8 @@ GIT_CONFIG_LOCAL 
% git repo-config core.filemode true
-

The hypothetic proxy command entries actually have a postfix to discern -to what URL they apply. Here is how to change the entry for kernel.org +

The hypothetical proxy command entries actually have a postfix to discern +what URL they apply to. Here is how to change the entry for kernel.org to "ssh".

@@ -888,7 +888,7 @@ imap
diff --git a/git-repo-config.txt b/git-repo-config.txt index 803c0d5ca..b03d66f61 100644 --- a/git-repo-config.txt +++ b/git-repo-config.txt @@ -119,8 +119,8 @@ you can set the filemode to true with % git repo-config core.filemode true ------------ -The hypothetic proxy command entries actually have a postfix to discern -to what URL they apply. Here is how to change the entry for kernel.org +The hypothetical proxy command entries actually have a postfix to discern +what URL they apply to. Here is how to change the entry for kernel.org to "ssh". ------------ diff --git a/git-rev-list.html b/git-rev-list.html index 21a1b1747..21dc6bf1c 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -345,7 +345,7 @@ $ git-rev-list A...B

Similar to --objects, but also print the IDs of - excluded commits refixed with a - character. This is + excluded commits prefixed with a - character. This is used by git-pack-objects to build thin pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network @@ -460,7 +460,7 @@ $ git-rev-list A...B

diff --git a/git-rev-list.txt b/git-rev-list.txt index 6c370e1be..e22084298 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -64,7 +64,7 @@ OPTIONS --objects-edge:: Similar to `--objects`, but also print the IDs of - excluded commits refixed with a `-` character. This is + excluded commits prefixed with a `-` character. This is used by `git-pack-objects` to build 'thin' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network diff --git a/git-tools.html b/git-tools.html index 4c458dbac..5088b6d13 100644 --- a/git-tools.html +++ b/git-tools.html @@ -316,7 +316,7 @@ until they get merged upstream.

-
gitk is a simple TK GUI for browsing history of GIT repositories easily.
+
gitk is a simple Tk GUI for browsing history of GIT repositories easily.
  • @@ -407,7 +407,7 @@ tweaking to work on XEmacs. diff --git a/git-tools.txt b/git-tools.txt index d79523f56..0914cbb0b 100644 --- a/git-tools.txt +++ b/git-tools.txt @@ -42,7 +42,7 @@ History Viewers - *gitk* (shipped with git-core) - gitk is a simple TK GUI for browsing history of GIT repositories easily. + gitk is a simple Tk GUI for browsing history of GIT repositories easily. - *gitview* (contrib/) diff --git a/git-upload-tar.html b/git-upload-tar.html index 7d51d26f1..4ccefc06f 100644 --- a/git-upload-tar.html +++ b/git-upload-tar.html @@ -280,7 +280,7 @@ git-upload-tar(1) Manual Page to the other end over the git protocol.

    This command is usually not invoked directly by the end user. The UI for the protocol is on the git-tar-tree side, and the -program pair is meant to be used to get a tar achive from a +program pair is meant to be used to get a tar archive from a remote repository.

    OPTIONS

    @@ -310,7 +310,7 @@ remote repository.

    diff --git a/git-upload-tar.txt b/git-upload-tar.txt index a1019a023..394af6201 100644 --- a/git-upload-tar.txt +++ b/git-upload-tar.txt @@ -17,7 +17,7 @@ to the other end over the git protocol. This command is usually not invoked directly by the end user. The UI for the protocol is on the 'git-tar-tree' side, and the -program pair is meant to be used to get a tar achive from a +program pair is meant to be used to get a tar archive from a remote repository. diff --git a/git.html b/git.html index ec9f74875..f23bdf6da 100644 --- a/git.html +++ b/git.html @@ -1325,7 +1325,7 @@ ancillary user utilities.

    Starting from 0.99.9 (actually mid 0.99.8.GIT), .git/config file is used to hold per-repository configuration options. It is a -simple text file modelled after .ini format familiar to some +simple text file modeled after .ini format familiar to some people. Here is an example:

    @@ -2105,7 +2105,7 @@ contributors on the git-list <git@vger.kernel.org>.

    diff --git a/git.txt b/git.txt index 51f20c6e6..d00cc3ea5 100644 --- a/git.txt +++ b/git.txt @@ -478,7 +478,7 @@ Configuration Mechanism Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file is used to hold per-repository configuration options. It is a -simple text file modelled after `.ini` format familiar to some +simple text file modeled after `.ini` format familiar to some people. Here is an example: ------------ diff --git a/glossary.html b/glossary.html index 303893e0e..ac629502a 100644 --- a/glossary.html +++ b/glossary.html @@ -448,7 +448,7 @@ div.exampleblock-content {

    Favorite synonym to "tree-ish" by some total geeks. See http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth - explanation. + explanation. Avoid this term, not to confuse people.

    • @@ -950,7 +950,7 @@ the git-list <git@vger.kernel.org>.

    diff --git a/glossary.txt b/glossary.txt index 116ddb7fb..14449ca8b 100644 --- a/glossary.txt +++ b/glossary.txt @@ -86,7 +86,7 @@ directory:: ent:: Favorite synonym to "tree-ish" by some total geeks. See `http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth - explanation. + explanation. Avoid this term, not to confuse people. fast forward:: A fast-forward is a special type of merge where you have diff --git a/howto-index.html b/howto-index.html index 77ecab288..9a5fe7b6a 100644 --- a/howto-index.html +++ b/howto-index.html @@ -360,7 +360,7 @@ as a Linux subsystem maintainer.

    diff --git a/howto/isolate-bugs-with-bisect.txt b/howto/isolate-bugs-with-bisect.txt index edbcd4c66..926bbdc3c 100644 --- a/howto/isolate-bugs-with-bisect.txt +++ b/howto/isolate-bugs-with-bisect.txt @@ -28,7 +28,7 @@ Then do and at this point "git bisect" will churn for a while, and tell you what the mid-point between those two commits are, and check that state out as -the head of the bew "bisect" branch. +the head of the new "bisect" branch. Compile and reboot. diff --git a/howto/rebase-from-internal-branch.txt b/howto/rebase-from-internal-branch.txt index c2d4a91c7..fcd64e9b9 100644 --- a/howto/rebase-from-internal-branch.txt +++ b/howto/rebase-from-internal-branch.txt @@ -124,7 +124,7 @@ up your changes, along with other changes. The two commits #2' and #3' in the above picture record the same changes your e-mail submission for #2 and #3 contained, but -probably with the new sign-off line added by the upsteam +probably with the new sign-off line added by the upstream maintainer and definitely with different committer and ancestry information, they are different objects from #2 and #3 commits. diff --git a/urls.txt b/urls.txt index 74774134e..d60b37147 100644 --- a/urls.txt +++ b/urls.txt @@ -47,7 +47,7 @@ Then such a short-hand is specified in place of without parameters on the command line, specified on `Push:` lines or `Pull:` lines are used for `git-push` and `git-fetch`/`git-pull`, -respectively. Multiple `Push:` and and `Pull:` lines may +respectively. Multiple `Push:` and `Pull:` lines may be specified for additional branch mappings. The name of a file in `$GIT_DIR/branches` directory can be -- 2.26.2