From 736fe60db4434470f9fbe3618e565257bb9825c8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 6 Jan 2006 17:17:58 -0800 Subject: [PATCH] Autogenerated man pages for 026351a03507dc3a2e89e068c01234dc55914df2 --- man1/git-add.1 | 2 +- man1/git-am.1 | 6 ++++-- man1/git-apply.1 | 7 +++++-- man1/git-archimport.1 | 8 +++++--- man1/git-cat-file.1 | 2 +- man1/git-checkout-index.1 | 6 ++++-- man1/git-clone.1 | 6 ++++-- man1/git-commit-tree.1 | 2 +- man1/git-commit.1 | 6 ++++-- man1/git-cvsexportcommit.1 | 2 +- man1/git-cvsimport.1 | 7 +++++-- man1/git-daemon.1 | 6 ++++-- man1/git-diff-files.1 | 4 ++-- man1/git-diff-index.1 | 8 ++++---- man1/git-diff-stages.1 | 4 ++-- man1/git-diff-tree.1 | 12 +++++++----- man1/git-diff.1 | 2 +- man1/git-format-patch.1 | 8 +++++--- man1/git-fsck-objects.1 | 6 ++++-- man1/git-grep.1 | 2 +- man1/git-http-fetch.1 | 4 ++-- man1/git-init-db.1 | 11 +++++++++-- man1/git-ls-files.1 | 2 +- man1/git-pack-objects.1 | 2 +- man1/git-repo-config.1 | 2 +- man1/git-rev-list.1 | 18 +++++++++++++++--- man1/git-show-branch.1 | 2 +- man1/git-svnimport.1 | 8 ++++---- man7/git.7 | 2 +- 29 files changed, 100 insertions(+), 57 deletions(-) diff --git a/man1/git-add.1 b/man1/git-add.1 index ebacf16ed..3c036d719 100755 --- a/man1/git-add.1 +++ b/man1/git-add.1 @@ -47,7 +47,7 @@ Be verbose\&. .SH "DISCUSSION" -The list of given to the command is fed to git\-ls\-files command to list files that are not registerd in the index and are not ignored/excluded by $GIT_DIR/info/exclude file or \&.gitignore file in each directory\&. This means two things: +The list of given to the command is fed to git\-ls\-files command to list files that are not registered in the index and are not ignored/excluded by $GIT_DIR/info/exclude file or \&.gitignore file in each directory\&. This means two things: .TP 3 1. diff --git a/man1/git-am.1 b/man1/git-am.1 index 4193b3acc..c1e5164e7 100755 --- a/man1/git-am.1 +++ b/man1/git-am.1 @@ -22,8 +22,10 @@ git-am \- Apply a series of patches in a mailbox .SH "SYNOPSIS" - -git\-am [\-\-signoff] [\-\-dotest=] [\-\-utf8] [\-\-binary] [\-\-3way] ... git\-am [\-\-skip | \-\-resolved] +.nf +git\-am [\-\-signoff] [\-\-dotest=] [\-\-utf8] [\-\-binary] [\-\-3way] ... +git\-am [\-\-skip | \-\-resolved] +.fi .SH "DESCRIPTION" diff --git a/man1/git-apply.1 b/man1/git-apply.1 index aca1a7195..5dac11d21 100755 --- a/man1/git-apply.1 +++ b/man1/git-apply.1 @@ -22,8 +22,11 @@ git-apply \- Apply patch on a git index file and a work tree .SH "SYNOPSIS" - -git\-apply [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index] [\-\-apply] [\-\-no\-add] [\-\-index\-info] [\-\-allow\-binary\-replacement] [\-z] [...] +.nf +git\-apply [\-\-stat] [\-\-numstat] [\-\-summary] [\-\-check] [\-\-index] [\-\-apply] + [\-\-no\-add] [\-\-index\-info] [\-\-allow\-binary\-replacement] [\-z] + [...] +.fi .SH "DESCRIPTION" diff --git a/man1/git-archimport.1 b/man1/git-archimport.1 index 601271e3a..3f3a4b670 100755 --- a/man1/git-archimport.1 +++ b/man1/git-archimport.1 @@ -22,13 +22,15 @@ git-archimport \- Import an Arch repository into git .SH "SYNOPSIS" - -git\-archimport [ \-h ] [ \-v ] [ \-o ] [ \-a ] [ \-f ] [ \-T ] [ \-D depth ] [ \-t tempdir ] [ ] +.nf +git\-archimport [\-h] [\-v] [\-o] [\-a] [\-f] [\-T] [\-D depth] [\-t tempdir] + [ ] +.fi .SH "DESCRIPTION" -Imports a project from one or more Arch repositories\&. It will follow branches and repositories within the namespaces defined by the parameters suppplied\&. If it cannot find the remote branch a merge comes from it will just import it as a regular commit\&. If it can find it, it will mark it as a merge whenever possible (see discussion below)\&. +Imports a project from one or more Arch repositories\&. It will follow branches and repositories within the namespaces defined by the parameters supplied\&. If it cannot find the remote branch a merge comes from it will just import it as a regular commit\&. If it can find it, it will mark it as a merge whenever possible (see discussion below)\&. The script expects you to provide the key roots where it can start the import from an initial import or tag type of Arch commit\&. It will follow and import new branches within the provided roots\&. diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1 index a7fb17af2..01f738608 100755 --- a/man1/git-cat-file.1 +++ b/man1/git-cat-file.1 @@ -23,7 +23,7 @@ git-cat-file \- Provide content or type information for repository objects .SH "SYNOPSIS" -git\-cat\-file (\-t | \-s | \-e | ) +git\-cat\-file [\-t | \-s | \-e | ] .SH "DESCRIPTION" diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1 index fe5e3ad24..c167462f9 100755 --- a/man1/git-checkout-index.1 +++ b/man1/git-checkout-index.1 @@ -22,8 +22,10 @@ git-checkout-index \- Copy files from the index to the working directory .SH "SYNOPSIS" - -git\-checkout\-index [\-u] [\-q] [\-a] [\-f] [\-n] [\-\-prefix=] [\-\-stage=] [\-\-] ... +.nf +git\-checkout\-index [\-u] [\-q] [\-a] [\-f] [\-n] [\-\-prefix=] + [\-\-stage=] [\-\-] ... +.fi .SH "DESCRIPTION" diff --git a/man1/git-clone.1 b/man1/git-clone.1 index 4966bab06..1d9bfcb3d 100755 --- a/man1/git-clone.1 +++ b/man1/git-clone.1 @@ -22,8 +22,10 @@ git-clone \- Clones a repository. .SH "SYNOPSIS" - -git\-clone [\-l [\-s]] [\-q] [\-n] [\-o ] [\-u ] [] +.nf +git\-clone [\-l [\-s]] [\-q] [\-n] [\-o ] [\-u ] + [] +.fi .SH "DESCRIPTION" diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index d62dd01e9..3129204d6 100755 --- a/man1/git-commit-tree.1 +++ b/man1/git-commit-tree.1 @@ -80,7 +80,7 @@ GIT_COMMITTER_EMAIL (nb "<", ">" and "\\n"s are stripped) -In \&.git/config file, the following items are used: +In \&.git/config file, the following items are used for GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL: .nf [user] diff --git a/man1/git-commit.1 b/man1/git-commit.1 index 9a7ce8be4..32913cf90 100755 --- a/man1/git-commit.1 +++ b/man1/git-commit.1 @@ -22,8 +22,10 @@ git-commit \- Record your changes .SH "SYNOPSIS" - -git\-commit [\-a] [\-s] [\-v] [(\-c | \-C) | \-F | \-m ] [\-e] [\-\-] ... +.nf +git\-commit [\-a] [\-s] [\-v] [(\-c | \-C) | \-F | \-m ] + [\-e] [\-\-] ... +.fi .SH "DESCRIPTION" diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index 3ebbce8de..3c50de07a 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" -git\-cvsexportcommmit\&.perl [ \-h ] [ \-v ] [ \-c ] [ \-p ] [PARENTCOMMIT] COMMITID +git\-cvsexportcommmit [\-h] [\-v] [\-c] [\-p] [PARENTCOMMIT] COMMITID .SH "DESCRIPTION" diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index f23e33a41..aa89209eb 100755 --- a/man1/git-cvsimport.1 +++ b/man1/git-cvsimport.1 @@ -22,8 +22,11 @@ git-cvsimport \- Import a CVS repository into git .SH "SYNOPSIS" - -git\-cvsimport [ \-o ] [ \-h ] [ \-v ] [ \-d ] [ \-p ] [ \-C ] [ \-i ] [ \-P ] [ \-k ] [ \-s ] [ \-m ] [ \-M regex ] [ ] +.nf +git\-cvsimport [\-o ] [\-h] [\-v] [\-d ] [\-s ] + [\-p ] [\-C ] [\-i] [\-P ] + [\-m] [\-M regex] [] +.fi .SH "DESCRIPTION" diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index 29cb1abc8..73c41ccea 100755 --- a/man1/git-daemon.1 +++ b/man1/git-daemon.1 @@ -22,8 +22,10 @@ git-daemon \- A really simple server for git repositories. .SH "SYNOPSIS" - -git\-daemon [\-\-verbose] [\-\-syslog] [\-\-inetd | \-\-port=n] [\-\-export\-all] [\-\-timeout=n] [\-\-init\-timeout=n] [\-\-strict\-paths] [directory...] +.nf +git\-daemon [\-\-verbose] [\-\-syslog] [\-\-inetd | \-\-port=n] [\-\-export\-all] + [\-\-timeout=n] [\-\-init\-timeout=n] [\-\-strict\-paths] [directory...] +.fi .SH "DESCRIPTION" diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 4785d47e6..275d4bdb2 100755 --- a/man1/git-diff-files.1 +++ b/man1/git-diff-files.1 @@ -58,7 +58,7 @@ Instead of the first handful characters, show full object name of pre\- and post .TP \-\-abbrev[=] -Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful dhexigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=\&. +Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=\&. .TP \-B @@ -258,7 +258,7 @@ What \-p option produces is slightly different from the traditional diff format\ .TP 3 1. -It is preceeded with a "git diff" header, that looks like this: +It is preceded with a "git diff" header, that looks like this: .nf diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index 93dfa505b..7e6bf468e 100755 --- a/man1/git-diff-index.1 +++ b/man1/git-diff-index.1 @@ -58,7 +58,7 @@ Instead of the first handful characters, show full object name of pre\- and post .TP \-\-abbrev[=] -Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful dhexigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=\&. +Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=\&. .TP \-B @@ -260,7 +260,7 @@ What \-p option produces is slightly different from the traditional diff format\ .TP 3 1. -It is preceeded with a "git diff" header, that looks like this: +It is preceded with a "git diff" header, that looks like this: .nf @@ -307,7 +307,7 @@ contents (the ones I'd write with a "git\-write\-tree") .fi -For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit\&. You want to see eactly what you are going to commit is without having to write a new tree object and compare it that way, and to do that, you just do +For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit\&. You want to see exactly what you are going to commit is without having to write a new tree object and compare it that way, and to do that, you just do .nf git\-diff\-index \-\-cached HEAD @@ -359,7 +359,7 @@ ie it shows that the tree has changed, and that kernel/sched\&.c has is not up\- .Sh "Note" -As with other commands of this type, "git\-diff\-index" does not actually look at the contents of the file at all\&. So maybe kernel/sched\&.c hasn't actually changed, and it's just that you touched it\&. In either case, it's a note that you need to "git\-upate\-index" it to make the index be in sync\&. +As with other commands of this type, "git\-diff\-index" does not actually look at the contents of the file at all\&. So maybe kernel/sched\&.c hasn't actually changed, and it's just that you touched it\&. In either case, it's a note that you need to "git\-update\-index" it to make the index be in sync\&. .RE diff --git a/man1/git-diff-stages.1 b/man1/git-diff-stages.1 index 94febbad5..d5622bd90 100755 --- a/man1/git-diff-stages.1 +++ b/man1/git-diff-stages.1 @@ -58,7 +58,7 @@ Instead of the first handful characters, show full object name of pre\- and post .TP \-\-abbrev[=] -Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful dhexigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=\&. +Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=\&. .TP \-B @@ -252,7 +252,7 @@ What \-p option produces is slightly different from the traditional diff format\ .TP 3 1. -It is preceeded with a "git diff" header, that looks like this: +It is preceded with a "git diff" header, that looks like this: .nf diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 847364514..13902b7f3 100755 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-tree.1 @@ -22,8 +22,10 @@ git-diff-tree \- Compares the content and mode of blobs found via two tree objects .SH "SYNOPSIS" - -git\-diff\-tree [\-\-stdin] [\-m] [\-s] [\-v] [\-\-no\-commit\-id] [\-\-pretty] [\-t] [\-r] [\-\-root] [] [] [...] +.nf +git\-diff\-tree [\-\-stdin] [\-m] [\-s] [\-v] [\-\-no\-commit\-id] [\-\-pretty] [\-t] [\-r] + [\-\-root] [] [] [...] +.fi .SH "DESCRIPTION" @@ -64,7 +66,7 @@ Instead of the first handful characters, show full object name of pre\- and post .TP \-\-abbrev[=] -Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful dhexigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=\&. +Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=\&. .TP \-B @@ -137,7 +139,7 @@ By default, "git\-diff\-tree \-\-stdin" does not show differences for merge comm .TP \-s -By default, "git\-diff\-tree \-\-stdin" shows differences, either in machine\-readable form (without \-p) or in patch form (with \-p)\&. This output can be supressed\&. It is only useful with \-v flag\&. +By default, "git\-diff\-tree \-\-stdin" shows differences, either in machine\-readable form (without \-p) or in patch form (with \-p)\&. This output can be suppressed\&. It is only useful with \-v flag\&. .TP \-v @@ -350,7 +352,7 @@ What \-p option produces is slightly different from the traditional diff format\ .TP 3 1. -It is preceeded with a "git diff" header, that looks like this: +It is preceded with a "git diff" header, that looks like this: .nf diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 6b46816c7..2b907c069 100755 --- a/man1/git-diff.1 +++ b/man1/git-diff.1 @@ -77,7 +77,7 @@ $ git diff HEAD^ HEAD instead of using the tip of the current branch, compare with the tip of "test" branch\&. instead of comparing with the tip of "test" branch, compare with -the tip of the curren branch, but limit the comparison to the +the tip of the current branch, but limit the comparison to the file "test"\&. compare the version before the last commit and the last commit\&. .TP diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index 0e1779ca7..e179bd2b5 100755 --- a/man1/git-format-patch.1 +++ b/man1/git-format-patch.1 @@ -22,8 +22,10 @@ git-format-patch \- Prepare patches for e-mail submission. .SH "SYNOPSIS" - -git\-format\-patch [\-n | \-k] [\-o | \-\-stdout] [\-s] [\-c] [\-\-mbox] [\-\-diff\-options] [] +.nf +git\-format\-patch [\-n | \-k] [\-o | \-\-stdout] [\-s] [\-c] [\-\-mbox] + [\-\-diff\-options] [] +.fi .SH "DESCRIPTION" @@ -90,7 +92,7 @@ The same as the previous one, except detect and handle renames and complete rewr .SH "SEE ALSO" -\fBgit\-am\fR(1), gitlink:git\-send\-email +\fBgit\-am\fR(1), \fBgit\-send\-email\fR(1) .SH "AUTHOR" diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1 index 0d08b7585..f4c874785 100755 --- a/man1/git-fsck-objects.1 +++ b/man1/git-fsck-objects.1 @@ -22,8 +22,10 @@ git-fsck-objects \- Verifies the connectivity and validity of the objects in the database .SH "SYNOPSIS" - -git\-fsck\-objects [\-\-tags] [\-\-root] [\-\-unreachable] [\-\-cache] [\-\-standalone | \-\-full] [\-\-strict] [*] +.nf +git\-fsck\-objects [\-\-tags] [\-\-root] [\-\-unreachable] [\-\-cache] + [\-\-standalone | \-\-full] [\-\-strict] [*] +.fi .SH "DESCRIPTION" diff --git a/man1/git-grep.1 b/man1/git-grep.1 index 5b6e697c8..be73f7787 100755 --- a/man1/git-grep.1 +++ b/man1/git-grep.1 @@ -23,7 +23,7 @@ git-grep \- print lines matching a pattern .SH "SYNOPSIS" -git\-grep