From 89dd4ee1070bb7e022a0ae8f233f2985ee5f4e3b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 7 Apr 2007 10:18:12 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.1-81-gee969 --- man1/git-bisect.1 | 15 ++++++++--- man1/git-cvsimport.1 | 60 +++++++++++++++++++++++--------------------- man1/git-read-tree.1 | 7 ++++-- 3 files changed, 47 insertions(+), 35 deletions(-) diff --git a/man1/git-bisect.1 b/man1/git-bisect.1 index 180f83611..7e0d3db10 100644 --- a/man1/git-bisect.1 +++ b/man1/git-bisect.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-BISECT" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual" +.TH "GIT\-BISECT" "1" "04/07/2007" "Git 1.5.1.81.gee969" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -15,7 +15,7 @@ git\-bisect \- Find the change that introduced a bug by binary search The command takes various subcommands, and different options depending on the subcommand: .sp .nf -git bisect start [...] +git bisect start [ [...]] [\-\-] [...] git bisect bad git bisect good git bisect reset [] @@ -91,11 +91,18 @@ $ git reset \-\-hard HEAD~3 # try 3 revs before what # was suggested .fi Then compile and test the one you chose to try. After that, tell bisect what the result was as usual. -.SS "Cutting down bisection by giving path parameter to bisect start" +.SS "Cutting down bisection by giving more parameters to bisect start" You can further cut down the number of trials if you know what part of the tree is involved in the problem you are tracking down, by giving paths parameters when you say bisect start, like this: .sp .nf -$ git bisect start arch/i386 include/asm\-i386 +$ git bisect start \-\- arch/i386 include/asm\-i386 +.fi +If you know beforehand more than one good commits, you can narrow the bisect space down without doing the whole tree checkout every time you give good commits. You give the bad revision immediately after start and then you give all the good revisions you have: +.sp +.nf +$ git bisect start v2.6.20\-rc6 v2.6.20\-rc4 v2.6.20\-rc1 \-\- + # v2.6.20\-rc6 is bad + # v2.6.20\-rc4 and v2.6.20\-rc1 are good .fi .SS "Bisect run" If you have a script that can tell if the current source code is good or bad, you can automatically bisect using: diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index 420f8baf9..5c3559f59 100644 --- a/man1/git-cvsimport.1 +++ b/man1/git-cvsimport.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-CVSIMPORT" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual" +.TH "GIT\-CVSIMPORT" "1" "04/07/2007" "Git 1.5.1.81.gee969" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,9 +12,11 @@ git\-cvsimport \- Salvage your data out of another SCM people love to hate .SH "SYNOPSIS" .sp .nf -\fIgit\-cvsimport\fR [\-o ] [\-h] [\-v] [\-d ] [\-s ] - [\-p ] [\-C ] [\-i] [\-P ] - [\-m] [\-M regex] [] +\fIgit\-cvsimport\fR [\-o ] [\-h] [\-v] [\-d ] + [\-A ] [\-p ] [\-P ] + [\-C ] [\-z ] [\-i] [\-k] [\-u] [\-s ] + [\-a] [\-m] [\-M ] [\-S ] [\-L ] + [] .fi .SH "DESCRIPTION" Imports a CVS repository into git. It will either create a new repository, or incrementally import into an existing one. @@ -24,31 +26,43 @@ Splitting the CVS log into patch sets is done by \fIcvsps\fR. At least version 2 You should \fBnever\fR do any work of your own on the branches that are created by git\-cvsimport. The initial import will create and populate a "master" branch from the CVS repository's main branch which you're free to work with; after that, you need to \fIgit merge\fR incremental imports, or any CVS branches, yourself. .SH "OPTIONS" .TP +\-v +Verbosity: let \fIcvsimport\fR report what it is doing. +.TP \-d -The root of the CVS archive. May be local (a simple path) or remote; currently, only the :local:, :ext: and :pserver: access methods are supported. +The root of the CVS archive. May be local (a simple path) or remote; currently, only the :local:, :ext: and :pserver: access methods are supported. If not given, git\-cvsimport will try to read it from CVS/Root. If no such file exists, it checks for the CVSROOT environment variable. +.TP + +The CVS module you want to import. Relative to . If not given, git\-cvsimport tries to read it from CVS/Repository. .TP \-C The git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory. .TP +\-o +The \fIHEAD\fR branch from CVS is imported to the \fIorigin\fR branch within the git repository, as \fIHEAD\fR already has a special meaning for git. Use this option if you want to import into a different branch. + +Use \fI\-o master\fR for continuing an import that was initially done by the old cvs2git tool. +.TP \-i Import\-only: don't perform a checkout after importing. This option ensures the working directory and index remain untouched and will not create them if they do not exist. .TP \-k -Kill keywords: will extract files with \-kk from the CVS archive to avoid noisy changesets. Highly recommended, but off by default to preserve compatibility with early imported trees. +Kill keywords: will extract files with \fI\-kk\fR from the CVS archive to avoid noisy changesets. Highly recommended, but off by default to preserve compatibility with early imported trees. .TP \-u Convert underscores in tag and branch names to dots. .TP -\-o -The \fIHEAD\fR branch from CVS is imported to the \fIorigin\fR branch within the git repository, as \fIHEAD\fR already has a special meaning for git. Use this option if you want to import into a different branch. - -Use \fI\-o master\fR for continuing an import that was initially done by the old cvs2git tool. +\-s +Substitute the character "/" in branch names with .TP \-p Additional options for cvsps. The options \fI\-u\fR and \fI\-A\fR are implicit and should not be used here. If you need to pass multiple options, separate them with a comma. .TP +\-z +Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps defaults to 300s. +.TP \-P Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport. .TP @@ -56,29 +70,14 @@ Instead of calling cvsps, read the provided cvsps output file. Useful for debugg Attempt to detect merges based on the commit message. This option will enable default regexes that try to capture the name source branch name from the commit message. .TP \-M -Attempt to detect merges based on the commit message with a custom regex. It can be used with \-m to also see the default regexes. You must escape forward slashes. -.TP -\-v -Verbosity: let \fIcvsimport\fR report what it is doing. -.TP - -The CVS module you want to import. Relative to . -.TP -\-h -Print a short usage message and exit. -.TP -\-z -Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps defaults to 300s. +Attempt to detect merges based on the commit message with a custom regex. It can be used with \fI\-m\fR to also see the default regexes. You must escape forward slashes. .TP -\-s -Substitute the character "/" in branch names with +\-S +Skip paths matching the regex. .TP \-a Import all commits, including recent ones. cvsimport by default skips commits that have a timestamp less than 10 minutes ago. .TP -\-S -Skip paths matching the regex. -.TP \-L Limit the number of commits imported. Workaround for cases where cvsimport leaks memory. .TP @@ -91,9 +90,12 @@ CVS by default uses the Unix username when writing its commit logs. Using this o .fi git\-cvsimport will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. -For convenience, this data is saved to $GIT_DIR/cvs\-authors each time the \-A option is provided and read from that same file each time git\-cvsimport is run. +For convenience, this data is saved to $GIT_DIR/cvs\-authors each time the \fI\-A\fR option is provided and read from that same file each time git\-cvsimport is run. It is not recommended to use this feature if you intend to export changes back to CVS again later with \fBgit\-cvsexportcommit\fR(1). +.TP +\-h +Print a short usage message and exit. .SH "OUTPUT" If \fI\-v\fR is specified, the script reports what it is doing. diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1 index c6289a73e..d4b77fe11 100644 --- a/man1/git-read-tree.1 +++ b/man1/git-read-tree.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-READ\-TREE" "1" "04/04/2007" "Git 1.5.1.31.ge421f" "Git Manual" +.TH "GIT\-READ\-TREE" "1" "04/07/2007" "Git 1.5.1.81.gee969" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,7 +10,7 @@ .SH "NAME" git\-read\-tree \- Reads tree information into the index .SH "SYNOPSIS" -\fIgit\-read\-tree\fR ( | [[\-m [\-\-aggressive] | \-\-reset | \-\-prefix=] [\-u | \-i]] [\-\-exclude\-per\-directory=] [ []]) +\fIgit\-read\-tree\fR ( | [[\-m [\-\-aggressive] | \-\-reset | \-\-prefix=] [\-u | \-i]] [\-\-exclude\-per\-directory=] [\-\-index\-output=] [ []]) .SH "DESCRIPTION" Reads the tree information given by into the index, but does not actually \fBupdate\fR any of the files it "caches". (see: \fBgit\-checkout\-index\fR(1)) @@ -51,6 +51,9 @@ Keep the current index contents, and read the contents of named tree\-ish under \-\-exclude\-per\-directory= When running the command with \-u and \-m options, the merge result may need to overwrite paths that are not tracked in the current branch. The command usually refuses to proceed with the merge to avoid losing such a path. However this safety valve sometimes gets in the way. For example, it often happens that the other branch added a file that used to be a generated file in your branch, and the safety valve triggers when you try to switch to that branch after you ran make but before running make clean to remove the generated file. This option tells the command to read per\-directory exclude file (usually \fI.gitignore\fR) and allows such an untracked but explicitly ignored file to be overwritten. .TP +\-\-index\-output= +Instead of writing the results out to $GIT_INDEX_FILE, write the resulting index in the named file. While the command is operating, the original index file is locked with the same mechanism as usual. The file must allow to be rename(2)ed into from a temporary file that is created next to the usual index file; typically this means it needs to be on the same filesystem as the index file itself, and you need write permission to the directories the index file and index output file are located in. +.TP The id of the tree object(s) to be read/merged. .SH "MERGING" -- 2.26.2