From be4cf8be43564376531e273298ed0709439efb18 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 5 May 2006 23:15:06 +0000 Subject: [PATCH] Autogenerated man pages for v1.3.2-g8611 --- man1/git-add.1 | 2 +- man1/git-checkout-index.1 | 2 +- man1/git-cherry.1 | 8 +++++++- man1/git-clone.1 | 2 +- man1/git-commit.1 | 2 +- man1/git-imap-send.1 | 19 +++++++++---------- man1/git-log.1 | 2 +- man1/git-ls-files.1 | 2 +- man1/git-merge-index.1 | 4 ++-- man1/git-name-rev.1 | 1 + man1/git-prune.1 | 8 +++++--- man1/git-repack.1 | 2 +- man1/git-repo-config.1 | 6 +++--- man1/git-reset.1 | 2 +- man1/git-rm.1 | 2 +- man1/git-unpack-objects.1 | 8 +++++++- man1/git-update-index.1 | 2 +- man1/git-verify-pack.1 | 2 +- man1/git-whatchanged.1 | 2 +- man1/gitk.1 | 8 ++++---- 20 files changed, 50 insertions(+), 36 deletions(-) diff --git a/man1/git-add.1 b/man1/git-add.1 index 731b9092f..d95c02db4 100755 --- a/man1/git-add.1 +++ b/man1/git-add.1 @@ -45,7 +45,7 @@ Don't actually add the file(s), just show if they exist\&. Be verbose\&. .TP --- +\-\- This option can be used to separate command\-line options from the list of files, (useful when filenames might be mistaken for command\-line options)\&. .SH "DISCUSSION" diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1 index 1a2160017..a2398a6fa 100755 --- a/man1/git-checkout-index.1 +++ b/man1/git-checkout-index.1 @@ -78,7 +78,7 @@ Instead of taking list of paths from the command line, read list of paths from t Only meaningful with \-\-stdin; paths are separated with NUL character instead of LF\&. .TP --- +\-\- Do not interpret any more arguments as options\&. diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index e8b8d509c..8d7eb96f9 100755 --- a/man1/git-cherry.1 +++ b/man1/git-cherry.1 @@ -28,7 +28,13 @@ git-cherry \- Find commits not merged upstream .SH "DESCRIPTION" -Each commit between the fork\-point and is examined, and compared against the change each commit between the fork\-point and introduces\&. Commits already included in upstream are prefixed with \fI\-\fR (meaning "drop from my local pull"), while commits missing from upstream are prefixed with \fI+\fR (meaning "add to the updated upstream")\&. +The changeset (or "diff") of each commit between the fork\-point and is compared against each commit between the fork\-point and \&. + + +Every commit with a changeset that doesn't exist in the other branch has its id (sha1) reported, prefixed by a symbol\&. Those existing only in the branch are prefixed with a minus (\-) sign, and those that only exist in the branch are prefixed with a plus (+) symbol\&. + + +Because git\-cherry compares the changeset rather than the commit id (sha1), you can use git\-cherry to find out if a commit you made locally has been applied under a different commit id\&. For example, this will happen if you're feeding patches via email rather than pushing or pulling commits directly\&. .SH "OPTIONS" diff --git a/man1/git-clone.1 b/man1/git-clone.1 index d43b3ba1c..772f953e4 100755 --- a/man1/git-clone.1 +++ b/man1/git-clone.1 @@ -85,7 +85,7 @@ The (possibly remote) repository to clone from\&. It can be any URL git\-fetch s The name of a new directory to clone into\&. The "humanish" part of the source repository is used if no directory is explicitly given ("repo" for "/path/to/repo\&.git" and "foo" for "host\&.xz:foo/\&.git")\&. Cloning into an existing directory is not allowed\&. -.SS "Examples" +.SH "EXAMPLES" .TP Clone from upstream diff --git a/man1/git-commit.1 b/man1/git-commit.1 index 9cf30eda3..7faec2341 100755 --- a/man1/git-commit.1 +++ b/man1/git-commit.1 @@ -101,7 +101,7 @@ Instead of committing only the files specified on the command line, update them Commit only the files specified on the command line\&. This format cannot be used during a merge, nor when the index and the latest commit does not match on the specified paths to avoid confusion\&. .TP --- +\-\- Do not interpret any more arguments as options\&. .TP diff --git a/man1/git-imap-send.1 b/man1/git-imap-send.1 index b39bf3107..479bf1144 100755 --- a/man1/git-imap-send.1 +++ b/man1/git-imap-send.1 @@ -42,18 +42,17 @@ git\-format\-patch \-\-signoff \-\-stdout \-\-attach origin | git\-imap\-send git\-imap\-send requires the following values in the repository configuration file (shown with examples): .nf -Folder = "INBOX\&.Drafts" -.fi +[imap] + Folder = "INBOX\&.Drafts" -.nf -Tunnel = "ssh \-q user@server\&.com /usr/bin/imapd \&./Maildir 2> /dev/null" -.fi +[imap] + Tunnel = "ssh \-q user@server\&.com /usr/bin/imapd \&./Maildir 2> /dev/null" -.nf -Host = imap\&.server\&.com -User = bob -Password = pwd -Port = 143 +[imap] + Host = imap\&.server\&.com + User = bob + Pass = pwd + Port = 143 .fi .SH "BUGS" diff --git a/man1/git-log.1 b/man1/git-log.1 index 530c27220..d7164cd87 100755 --- a/man1/git-log.1 +++ b/man1/git-log.1 @@ -69,7 +69,7 @@ git log v2\&.6\&.12\&.\&. include/scsi drivers/scsi Show all commits since version \fIv2\&.6\&.12\fR that changed any file in the include/scsi or drivers/scsi subdirectories .TP -git log \-\-since="2 weeks ago" -- gitk +git log \-\-since="2 weeks ago" \-\- gitk Show the changes during the last two weeks to the file \fIgitk\fR\&. The "\-\-" is necessary to avoid confusion with the \fIbranch\fR named \fIgitk\fR .TP diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index e62f3a022..efe6af5c5 100755 --- a/man1/git-ls-files.1 +++ b/man1/git-ls-files.1 @@ -144,7 +144,7 @@ When run from a subdirectory, the command usually outputs paths relative to the Instead of showing the full 40\-byte hexadecimal object lines, show only handful hexdigits prefix\&. Non default number of digits can be specified with \-\-abbrev=\&. .TP --- +\-\- Do not interpret any more arguments as options\&. .TP diff --git a/man1/git-merge-index.1 b/man1/git-merge-index.1 index 5d68938a3..7bef26b7a 100755 --- a/man1/git-merge-index.1 +++ b/man1/git-merge-index.1 @@ -23,7 +23,7 @@ git-merge-index \- Runs a merge for files needing merging .SH "SYNOPSIS" -git\-merge\-index [\-o] [\-q] (\-a | -- | *) +\fIgit\-merge\-index\fR [\-o] [\-q] (\-a | \-\- | *) .SH "DESCRIPTION" @@ -33,7 +33,7 @@ This looks up the (s) in the index and, if there are any merge entries, pa .SH "OPTIONS" .TP --- +\-\- Do not interpret any more arguments as options\&. .TP diff --git a/man1/git-name-rev.1 b/man1/git-name-rev.1 index 6c47b9844..a3613d210 100755 --- a/man1/git-name-rev.1 +++ b/man1/git-name-rev.1 @@ -54,6 +54,7 @@ Enter git\-name\-rev: .nf % git name\-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a +33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0\&.99^0~940 .fi diff --git a/man1/git-prune.1 b/man1/git-prune.1 index a3abd84fc..7d1703198 100755 --- a/man1/git-prune.1 +++ b/man1/git-prune.1 @@ -23,7 +23,7 @@ git-prune \- Prunes all unreachable objects from the object database .SH "SYNOPSIS" -git\-prune [\-n] [\-\-] [...] +\fIgit\-prune\fR [\-n] [\-\-] [...] .SH "DESCRIPTION" @@ -37,7 +37,7 @@ This runs git\-fsck\-objects \-\-unreachable using all the refs available in $GI Do not remove anything; just report what it would remove\&. .TP --- +\-\- Do not interpret any more arguments as options\&. .TP @@ -49,8 +49,10 @@ In addition to objects reachable from any of our references, keep objects reacha To prune objects not used by your repository nor another that borrows from your repository via its \&.git/objects/info/alternates: -.IP +.nf $ git prune $(cd \&.\&./another && $(git\-rev\-parse \-\-all)) +.fi + .SH "AUTHOR" diff --git a/man1/git-repack.1 b/man1/git-repack.1 index edf251721..bbe8c4a0b 100755 --- a/man1/git-repack.1 +++ b/man1/git-repack.1 @@ -44,7 +44,7 @@ Instead of incrementally packing the unpacked objects, pack everything available .TP \-d -After packing, if the newly created packs make some existing packs redundant, remove the redundant packs\&. +After packing, if the newly created packs make some existing packs redundant, remove the redundant packs\&. Also runs \fBgit\-prune\-packed\fR(1)\&. .TP \-l diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1 index ef6dfb5f4..075085104 100755 --- a/man1/git-repo-config.1 +++ b/man1/git-repo-config.1 @@ -44,14 +44,14 @@ If you want to set/unset an option which can occur on multiple lines, you should The type specifier can be either \fI\-\-int\fR or \fI\-\-bool\fR, which will make \fIgit\-repo\-config\fR ensure that the variable(s) are of the given type and convert the value to the canonical form (simple decimal number for int, a "true" or "false" string for bool)\&. If no type specifier is passed, no checks or transformations are performed on the value\&. -This command will fail if +This command will fail if: .TP 3 1. -\&.git/config is invalid, +The \&.git/config file is invalid, .TP 2. -\&.git/config can not be written to, +Can not write to \&.git/config, .TP 3. no section was provided, diff --git a/man1/git-reset.1 b/man1/git-reset.1 index bfa0082fd..eccf1fac6 100755 --- a/man1/git-reset.1 +++ b/man1/git-reset.1 @@ -54,7 +54,7 @@ Matches the working tree and index to that of the tree being switched to\&. Any Commit to make the current HEAD\&. -.SS "Examples" +.SH "EXAMPLES" .TP Undo a commit and redo diff --git a/man1/git-rm.1 b/man1/git-rm.1 index fa3c0849f..9668ff245 100755 --- a/man1/git-rm.1 +++ b/man1/git-rm.1 @@ -49,7 +49,7 @@ Don't actually remove the file(s), just show if they exist in the index\&. Be verbose\&. .TP --- +\-\- This option can be used to separate command\-line options from the list of files, (useful when filenames might be mistaken for command\-line options)\&. .SH "DISCUSSION" diff --git a/man1/git-unpack-objects.1 b/man1/git-unpack-objects.1 index 13a671016..237adfa45 100755 --- a/man1/git-unpack-objects.1 +++ b/man1/git-unpack-objects.1 @@ -28,7 +28,13 @@ git-unpack-objects \- Unpack objects from a packed archive .SH "DESCRIPTION" -Reads a packed archive (\&.pack) from the standard input, and expands the objects contained in the pack into "one\-file one\-object" format in $GIT_OBJECT_DIRECTORY\&. +Read a packed archive (\&.pack) from the standard input, expanding the objects contained within and writing them into the repository in "loose" (one object per file) format\&. + + +Objects that already exist in the repository will \fInot\fR be unpacked from the pack\-file\&. Therefore, nothing will be unpacked if you use this command on a pack\-file that exists within the target repository\&. + + +Please see the git\-repack documentation for options to generate new packs and replace existing ones\&. .SH "OPTIONS" diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index cdde33066..10a1d1f41 100755 --- a/man1/git-update-index.1 +++ b/man1/git-update-index.1 @@ -115,7 +115,7 @@ Report what is being added and removed from index\&. Only meaningful with \-\-stdin; paths are separated with NUL character instead of LF\&. .TP --- +\-\- Do not interpret any more arguments as options\&. .TP diff --git a/man1/git-verify-pack.1 b/man1/git-verify-pack.1 index 2a1995116..beb003ed3 100755 --- a/man1/git-verify-pack.1 +++ b/man1/git-verify-pack.1 @@ -41,7 +41,7 @@ The idx files to verify\&. After verifying the pack, show list of objects contained in the pack\&. .TP --- +\-\- Do not interpret any more arguments as options\&. .SH "OUTPUT FORMAT" diff --git a/man1/git-whatchanged.1 b/man1/git-whatchanged.1 index ee7aa03cf..7ec2674a3 100755 --- a/man1/git-whatchanged.1 +++ b/man1/git-whatchanged.1 @@ -68,7 +68,7 @@ git\-whatchanged \-p v2\&.6\&.12\&.\&. include/scsi drivers/scsi Show as patches the commits since version \fIv2\&.6\&.12\fR that changed any file in the include/scsi or drivers/scsi subdirectories .TP -git\-whatchanged \-\-since="2 weeks ago" -- gitk +git\-whatchanged \-\-since="2 weeks ago" \-\- gitk Show the changes during the last two weeks to the file \fIgitk\fR\&. The "\-\-" is necessary to avoid confusion with the \fIbranch\fR named \fIgitk\fR .SH "AUTHOR" diff --git a/man1/gitk.1 b/man1/gitk.1 index 2e3aabb0b..49e497668 100755 --- a/man1/gitk.1 +++ b/man1/gitk.1 @@ -23,7 +23,7 @@ gitk \- Some git command not yet documented. .SH "SYNOPSIS" -gitk [ \-\-option ] ... +\fIgitk\fR [ \-\-option ] ... .SH "DESCRIPTION" @@ -44,11 +44,11 @@ Some argument not yet documented\&. .TP gitk v2\&.6\&.12\&.\&. include/scsi drivers/scsi -Show as the changes since version v2\&.6\&.12 that changed any file in the include/scsi or drivers/scsi subdirectories +Show as the changes since version \fIv2\&.6\&.12\fR that changed any file in the include/scsi or drivers/scsi subdirectories .TP -gitk \-\-since="2 weeks ago" -- gitk -Show the changes during the last two weeks to the file gitk\&. The "\-\-" is necessary to avoid confusion with the branch named gitk +gitk \-\-since="2 weeks ago" \-\- gitk +Show the changes during the last two weeks to the file \fIgitk\fR\&. The "\-\-" is necessary to avoid confusion with the \fIbranch\fR named \fIgitk\fR .SH "AUTHOR" -- 2.26.2