From 2d33b01679f184bc095433058a626b6698681994 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 9 Jul 2006 20:39:24 +0000 Subject: [PATCH] Autogenerated man pages for v1.4.1-gff4c8 --- man1/git-cvsexportcommit.1 | 2 +- man1/git-diff-files.1 | 2 +- man1/git-diff.1 | 10 +++++----- man1/git-fetch.1 | 2 +- man1/git-init-db.1 | 2 +- man1/git-mailsplit.1 | 2 +- man1/git-merge.1 | 2 +- man1/git-p4import.1 | 4 ++-- man1/git-pack-redundant.1 | 2 +- man1/git-pull.1 | 2 +- man1/git-push.1 | 4 ++-- man1/git-repo-config.1 | 2 +- man1/git-rev-list.1 | 2 +- man1/git-upload-tar.1 | 2 +- man7/git.7 | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index e17094cd6..a560d84a3 100755 --- a/man1/git-cvsexportcommit.1 +++ b/man1/git-cvsexportcommit.1 @@ -23,7 +23,7 @@ git-cvsexportcommit \- Export a commit to a CVS checkout .SH "SYNOPSIS" -\fIgit\-cvsexportcommmit\fR [\-h] [\-v] [\-c] [\-p] [\-f] [\-m msgprefix] [PARENTCOMMIT] COMMITID +\fIgit\-cvsexportcommit\fR [\-h] [\-v] [\-c] [\-p] [\-f] [\-m msgprefix] [PARENTCOMMIT] COMMITID .SH "DESCRIPTION" diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 42b43d93e..08b17434f 100755 --- a/man1/git-diff-files.1 +++ b/man1/git-diff-files.1 @@ -143,7 +143,7 @@ This compares stage 2 (our branch), stage 3 (their branch) and the working tree .TP \-q -Remain silent even on nonexisting files +Remain silent even on nonexistent files .SH "OUTPUT FORMAT" diff --git a/man1/git-diff.1 b/man1/git-diff.1 index e4e9f4d08..845574dc3 100755 --- a/man1/git-diff.1 +++ b/man1/git-diff.1 @@ -23,22 +23,22 @@ git-diff \- Show changes between commits, commit and working tree, etc .SH "SYNOPSIS" -\fIgit\-diff\fR [ \-\-diff\-options ] {0,2} [...] +\fIgit\-diff\fR [ \-\-diff\-options ] {0,2} [...] .SH "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\&. The combination of what is compared with what is determined by the number of ents given to the command\&. +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 trees given to the command\&. .TP 3 \(bu -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\&. .TP \(bu -When one is given, the working tree and the named tree is compared, using git\-diff\-index\&. The option \-\-cached can be given to compare the index file and the named tree\&. +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\&. .TP \(bu -When two s are given, these two trees are compared using git\-diff\-tree\&. +When two s are given, these two trees are compared using git\-diff\-tree\&. .LP .SH "OPTIONS" diff --git a/man1/git-fetch.1 b/man1/git-fetch.1 index 9e25988e8..5f357bab9 100755 --- a/man1/git-fetch.1 +++ b/man1/git-fetch.1 @@ -175,7 +175,7 @@ Pull: .fi -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 be specified for additional branch mappings\&. +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 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 file should contain a single line, a URL in one of the above formats, optionally followed by a hash # and the name of remote head (URL fragment notation)\&. $GIT_DIR/branches/ file that stores a without the fragment is equivalent to have this in the corresponding file in the $GIT_DIR/remotes/ directory\&. diff --git a/man1/git-init-db.1 b/man1/git-init-db.1 index 626d9924f..2ac9b279d 100755 --- a/man1/git-init-db.1 +++ b/man1/git-init-db.1 @@ -38,7 +38,7 @@ Specify that the git repository is to be shared amongst several users\&. .SH "DESCRIPTION" -This command creates an empty git repository \- basically a \&.git directory with subdirectories for objects, refs/heads, refs/tags, and templated files\&. An initial HEAD file that references the HEAD of the master branch is also created\&. +This command creates an empty git repository \- basically a \&.git directory with subdirectories for objects, refs/heads, refs/tags, and template files\&. An initial HEAD file that references the HEAD of the master branch is also created\&. If \-\-template= is specified, is used as the source of the template files rather than the default\&. The template files include some directory structure, some suggested "exclude patterns", and copies of non\-executing "hook" files\&. The suggested patterns and hook files are all modifiable and extensible\&. diff --git a/man1/git-mailsplit.1 b/man1/git-mailsplit.1 index bf117d7bd..23f8961ec 100755 --- a/man1/git-mailsplit.1 +++ b/man1/git-mailsplit.1 @@ -42,7 +42,7 @@ Directory in which to place the individual messages\&. .TP \-b -If any file doesn't begin with a From line, assume it is a single mail message instead of signalling error\&. +If any file doesn't begin with a From line, assume it is a single mail message instead of signaling error\&. .TP \-d diff --git a/man1/git-merge.1 b/man1/git-merge.1 index 5d5fd82aa..44b17194a 100755 --- a/man1/git-merge.1 +++ b/man1/git-merge.1 @@ -101,7 +101,7 @@ Otherwise, merge will refuse to do any harm to your repository (that is, it may You may have local modifications in the working tree files\&. In other words, git\-diff is allowed to report changes\&. However, the merge uses your working tree as the working area, and in order to prevent the merge operation from losing such changes, it makes sure that they do not interfere with the merge\&. Those complex tables in read\-tree documentation define 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 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\&. +So in the above two "failed merge" case, you do not have to 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\&. When things cleanly merge, these things happen: diff --git a/man1/git-p4import.1 b/man1/git-p4import.1 index b8be8134c..1e45e1aca 100755 --- a/man1/git-p4import.1 +++ b/man1/git-p4import.1 @@ -130,7 +130,7 @@ Another option is to create multiple symlinks locally which all point to the sam .SH "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\&. +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, 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\&. @@ -141,7 +141,7 @@ If you import from a repository with many thousands of changes you will have an .SH "NOTES" -You can interrupt the import (eg\&. ctrl\-c) at any time and restart it without worry\&. +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\&. However, if you want to manually supply these mappings you can do so with the "\-\-authors" option\&. It accepts a file containing a list of mappings with each line containing one mapping in the format: diff --git a/man1/git-pack-redundant.1 b/man1/git-pack-redundant.1 index 9374273ec..505f02e50 100755 --- a/man1/git-pack-redundant.1 +++ b/man1/git-pack-redundant.1 @@ -40,7 +40,7 @@ git\-fsck\-objects \-\-full \-\-unreachable | cut \-d \fI \fR \-f3 | git\-pack\- .TP \-\-all -Processes all packs\&. Any filenames on the commandline are ignored\&. +Processes all packs\&. Any filenames on the command line are ignored\&. .TP \-\-alt\-odb diff --git a/man1/git-pull.1 b/man1/git-pull.1 index 73e961b3b..ca9547692 100755 --- a/man1/git-pull.1 +++ b/man1/git-pull.1 @@ -191,7 +191,7 @@ Pull: .fi -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 be specified for additional branch mappings\&. +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 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 file should contain a single line, a URL in one of the above formats, optionally followed by a hash # and the name of remote head (URL fragment notation)\&. $GIT_DIR/branches/ file that stores a without the fragment is equivalent to have this in the corresponding file in the $GIT_DIR/remotes/ directory\&. diff --git a/man1/git-push.1 b/man1/git-push.1 index cb06395b0..51c83b4b1 100755 --- a/man1/git-push.1 +++ b/man1/git-push.1 @@ -72,7 +72,7 @@ All refs under $GIT_DIR/refs/tags are pushed, in addition to refspecs explicitly .TP \-f, \-\-force -Usually, the command refuses to update a remote ref that is not a descendent 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\&. +Usually, the command refuses to update a remote ref that is 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\&. .SH "GIT URLS" @@ -145,7 +145,7 @@ Pull: .fi -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 be specified for additional branch mappings\&. +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 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 file should contain a single line, a URL in one of the above formats, optionally followed by a hash # and the name of remote head (URL fragment notation)\&. $GIT_DIR/branches/ file that stores a without the fragment is equivalent to have this in the corresponding file in the $GIT_DIR/remotes/ directory\&. diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1 index d96ff2060..4cc2fc5cd 100755 --- a/man1/git-repo-config.1 +++ b/man1/git-repo-config.1 @@ -150,7 +150,7 @@ you can set the filemode to true with .fi -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 to "ssh"\&. +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"\&. .nf % git repo\-config core\&.gitproxy '"ssh" for kernel\&.org' 'for kernel\&.org$' diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index 46945ab15..ba4d409d1 100755 --- a/man1/git-rev-list.1 +++ b/man1/git-rev-list.1 @@ -74,7 +74,7 @@ Print the object IDs of any object referenced by the listed commits\&. \fIgit\-r .TP \-\-objects\-edge -Similar to \-\-objects, but also print the IDs of excluded commits refixed with a \- character\&. This is used by git\-pack\-objects to build \fIthin\fR pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic\&. +Similar to \-\-objects, but also print the IDs of excluded commits prefixed with a \- character\&. This is used by git\-pack\-objects to build \fIthin\fR pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic\&. .TP \-\-unpacked diff --git a/man1/git-upload-tar.1 b/man1/git-upload-tar.1 index 872c8874a..d3d3523aa 100755 --- a/man1/git-upload-tar.1 +++ b/man1/git-upload-tar.1 @@ -31,7 +31,7 @@ git-upload-tar \- Send tar archive Invoked by \fIgit\-tar\-tree \-\-remote\fR and sends a generated tar archive 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 \fIgit\-tar\-tree\fR side, and the program pair is meant to be used to get a tar achive from a remote repository\&. +This command is usually not invoked directly by the end user\&. The UI for the protocol is on the \fIgit\-tar\-tree\fR side, and the program pair is meant to be used to get a tar archive from a remote repository\&. .SH "OPTIONS" diff --git a/man7/git.7 b/man7/git.7 index dc3f2cc0c..4ad8b1003 100755 --- a/man7/git.7 +++ b/man7/git.7 @@ -567,7 +567,7 @@ The gitk repository browser\&. .SH "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 people\&. Here is an example: +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 modeled after \&.ini format familiar to some people\&. Here is an example: .nf # -- 2.26.2