From db33eb629baab42446f1d5ab5c42ec36532f3dd4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 31 Oct 2007 05:57:22 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.3.4-498-g9c514 --- man1/git-bisect.1 | 21 ++++-- man1/git-cvsexportcommit.1 | 4 +- man1/git-merge.1 | 10 +-- man1/git-rev-list.1 | 10 ++- man1/git-svnimport.1 | 132 ------------------------------------- man7/git.7 | 5 +- 6 files changed, 34 insertions(+), 148 deletions(-) delete mode 100644 man1/git-svnimport.1 diff --git a/man1/git-bisect.1 b/man1/git-bisect.1 index af2e8709c..3be2a9d2b 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" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-BISECT" "1" "10/31/2007" "Git 1.5.3.4.498.g9c514" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -16,8 +16,9 @@ The command takes various subcommands, and different options depending on the su .sp .nf git bisect start [ [...]] [\-\-] [...] -git bisect bad -git bisect good +git bisect bad [] +git bisect good [...] +git bisect skip [...] git bisect reset [] git bisect visualize git bisect replay @@ -118,6 +119,16 @@ $ git reset \-\-hard HEAD~3 # try 3 revs before what .fi Then compile and test the one you chose to try. After that, tell bisect what the result was as usual. +.SS "Bisect skip" +Instead of choosing by yourself a nearby commit, you may just want git to do it for you using: +.sp +.nf +.ft C +$ git bisect skip # Current version cannot be tested +.ft + +.fi +But computing the commit to test may be slower afterwards and git may eventually not be able to tell the first bad among a bad and one or more "skip"ped commits. .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 @@ -146,10 +157,12 @@ $ git bisect run my_script .ft .fi -Note that the "run" script (my_script in the above example) should exit with code 0 in case the current source code is good and with a code between 1 and 127 (included) in case the current source code is bad. +Note that the "run" script (my_script in the above example) should exit with code 0 in case the current source code is good. Exit with a code between 1 and 127 (inclusive), except 125, if the current source code is bad. Any other exit code will abort the automatic bisect process. (A program that does "exit(\-1)" leaves $? = 255, see exit(3) manual page, the value is chopped with "& 0377".) +The special exit code 125 should be used when the current source code cannot be tested. If the "run" script exits with this code, the current revision will be skipped, see git bisect skip above. + You may often find that during bisect you want to have near\-constant tweaks (e.g., s/#define DEBUG 0/#define DEBUG 1/ in a header file, or "revision that does not have this commit needs this patch applied to work around other problem this bisection is not interested in") applied to the revision being tested. To cope with such a situation, after the inner git\-bisect finds the next revision to test, with the "run" script, you can apply that tweak before compiling, run the real test, and after the test decides if the revision (possibly with the needed tweaks) passed the test, rewind the tree to the pristine state. Finally the "run" script can exit with the status of the real test to let "git bisect run" command loop to know the outcome. diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index 6d717f8e1..91a463970 100644 --- a/man1/git-cvsexportcommit.1 +++ b/man1/git-cvsexportcommit.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\-CVSEXPORTCOMMIT" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual" +.TH "GIT\-CVSEXPORTCOMMIT" "1" "10/31/2007" "Git 1.5.3.4.498.g9c514" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -58,7 +58,7 @@ Merge one patch into CVS $ export GIT_DIR=~/project/.git $ cd ~/project_cvs_checkout $ git\-cvsexportcommit \-v -$ cvs commit \-F .mgs +$ cvs commit \-F .msg .ft .fi diff --git a/man1/git-merge.1 b/man1/git-merge.1 index 4a07dd87e..ed5bef708 100644 --- a/man1/git-merge.1 +++ b/man1/git-merge.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\-MERGE" "1" "10/03/2007" "Git 1.5.3.4.203.gcc61a" "Git Manual" +.TH "GIT\-MERGE" "1" "10/31/2007" "Git 1.5.3.4.498.g9c514" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,9 +14,12 @@ git\-merge \- Join two or more development histories together .nf \fIgit\-merge\fR [\-n] [\-\-summary] [\-\-no\-commit] [\-\-squash] [\-s ]\&... [\-m ] \&... +\fIgit\-merge\fR HEAD \&... .fi .SH "DESCRIPTION" This is the top\-level interface to the merge machinery which drives multiple merge strategy scripts. + +The second syntax ( HEAD ) is supported for historical reasons. Do not use it from the command line or in new scripts. It is the same as git merge \-m . .SH "OPTIONS" .TP \-\-summary @@ -46,12 +49,9 @@ Do not generate a merge commit if the merge resolved as a fast\-forward, only up \-s , \-\-strategy= Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no \-s option, a built\-in list of strategies is used instead (git\-merge\-recursive when merging a single head, git\-merge\-octopus otherwise). .TP - +\-m The commit message to be used for the merge commit (in case it is created). The git\-fmt\-merge\-msg script can be used to give a good default for automated git\-merge invocations. .TP - -Our branch head commit. This has to be HEAD, so new syntax does not require it -.TP Other branch head merged into our branch. You need at least one . Specifying more than one obviously means you are trying an Octopus. .SH "MERGE STRATEGIES" diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index 1d10066b5..8d7f1e340 100644 --- a/man1/git-rev-list.1 +++ b/man1/git-rev-list.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\-REV\-LIST" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual" +.TH "GIT\-REV\-LIST" "1" "10/31/2007" "Git 1.5.3.4.498.g9c514" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -37,6 +37,7 @@ git\-rev\-list \- Lists commit objects in reverse chronological order [ \-\-pretty | \-\-header ] [ \-\-bisect ] [ \-\-bisect\-vars ] + [ \-\-bisect\-all ] [ \-\-merge ] [ \-\-reverse ] [ \-\-walk\-reflogs ] @@ -250,6 +251,13 @@ would be of roughly the same length. Finding the change which introduces a regre .TP \-\-bisect\-vars This calculates the same as \-\-bisect, but outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable bisect_rev, and the expected number of commits to be tested after bisect_rev is tested to bisect_nr, the expected number of commits to be tested if bisect_rev turns out to be good to bisect_good, the expected number of commits to be tested if bisect_rev turns out to be bad to bisect_bad, and the number of commits we are bisecting right now to bisect_all. +.TP +\-\-bisect\-all +This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. The farthest from them is displayed first. (This is the only one displayed by \-\-bisect.) + +This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example). + +This option can be used along with \-\-bisect\-vars, in this case, after all the sorted commit objects, there will be the same text as if \-\-bisect\-vars had been used alone. .SS "Commit Ordering" By default, the commits are shown in reverse chronological order. .TP diff --git a/man1/git-svnimport.1 b/man1/git-svnimport.1 deleted file mode 100644 index 24282cdad..000000000 --- a/man1/git-svnimport.1 +++ /dev/null @@ -1,132 +0,0 @@ -.\" ** You probably do not want to edit this file directly ** -.\" 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\-SVNIMPORT" "1" "08/23/2007" "Git 1.5.3.rc6.9.gaabb2" "Git Manual" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -git\-svnimport \- Import a SVN repository into git -.SH "SYNOPSIS" -.sp -.nf -\fIgit\-svnimport\fR [ \-o ] [ \-h ] [ \-v ] [ \-d | \-D ] - [ \-C ] [ \-i ] [ \-u ] [\-l limit_rev] - [ \-b branch_subdir ] [ \-T trunk_subdir ] [ \-t tag_subdir ] - [ \-s start_chg ] [ \-m ] [ \-r ] [ \-M regex ] - [ \-I ] [ \-A ] - [ \-R ] [ \-P ] - [ ] -.fi -.SH "DESCRIPTION" -Imports a SVN repository into git. It will either create a new repository, or incrementally import into an existing one. - -SVN access is done by the SVN::Perl module. - -git\-svnimport assumes that SVN repositories are organized into one "trunk" directory where the main development happens, "branches/FOO" directories for branches, and "/tags/FOO" directories for tags. Other subdirectories are ignored. - -git\-svnimport creates a file ".git/svn2git", which is required for incremental SVN imports. -.SH "OPTIONS" -.TP -\-C -The GIT repository to import to. If the directory doesn't exist, it will be created. Default is the current directory. -.TP -\-s -Start importing at this SVN change number. The default is 1. - -When importing incrementally, you might need to edit the .git/svn2git file. -.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 -\-T -Name the SVN trunk. Default "trunk". -.TP -\-t -Name the SVN subdirectory for tags. Default "tags". -.TP -\-b -Name the SVN subdirectory for branches. Default "branches". -.TP -\-o -The \fItrunk\fR branch from SVN is imported to the \fIorigin\fR branch within the git repository. Use this option if you want to import into a different branch. -.TP -\-r -Prepend \fIrX: \fR to commit messages, where X is the imported subversion revision. -.TP -\-u -Replace underscores in tag names with periods. -.TP -\-I -Import the svn:ignore directory property to files with this name in each directory. (The Subversion and GIT ignore syntaxes are similar enough that using the Subversion patterns directly with "\-I .gitignore" will almost always just work.) -.TP -\-A -Read a file with lines on the form -.sp -.nf -.ft C - username = User's Full Name -.ft - -.fi -and use "User's Full Name " as the GIT author and committer for Subversion commits made by "username". If encountering a commit made by a user not in the list, abort. - -For convenience, this data is saved to $GIT_DIR/svn\-authors each time the \-A option is provided, and read from that same file each time git\-svnimport is run with an existing GIT repository without \-A. -.TP -\-m -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 -\-l -Specify a maximum revision number to pull. - -Formerly, this option controlled how many revisions to pull, due to SVN memory leaks. (These have been worked around.) -.TP -\-R -Specify how often git repository should be repacked. - -The default value is 1000. git\-svnimport will do import in chunks of 1000 revisions, after each chunk git repository will be repacked. To disable this behavior specify some big value here which is mote than number of revisions to import. -.TP -\-P -Partial import of the SVN tree. - -By default, the whole tree on the SVN trunk (/trunk) is imported. \fI\-P my/proj\fR will import starting only from \fI/trunk/my/proj\fR. This option is useful when you want to import one project from a svn repo which hosts multiple projects under the same trunk. -.TP -\-v -Verbosity: let \fIsvnimport\fR report what it is doing. -.TP -\-d -Use direct HTTP requests if possible. The "" argument is used only for retrieving the SVN logs; the path to the contents is included in the SVN log. -.TP -\-D -Use direct HTTP requests if possible. The "" argument is used for retrieving the logs, as well as for the contents. - -There's no safe way to automatically find out which of these options to use, so you need to try both. Usually, the one that's wrong will die with a 40x error pretty quickly. -.TP - -The URL of the SVN module you want to import. For local repositories, use "file:///absolute/path". - -If you're using the "\-d" or "\-D" option, this is the URL of the SVN repository itself; it usually ends in "/svn". -.TP - -The path to the module you want to check out. -.TP -\-h -Print a short usage message and exit. -.SH "OUTPUT" -If \fI\-v\fR is specified, the script reports what it is doing. - -Otherwise, success is indicated the Unix way, i.e. by simply exiting with a zero exit status. -.SH "AUTHOR" -Written by Matthias Urlichs , with help from various participants of the git\-list . - -Based on a cvs2git script by the same author. -.SH "DOCUMENTATION" -Documentation by Matthias Urlichs . -.SH "GIT" -Part of the \fBgit\fR(7) suite - diff --git a/man7/git.7 b/man7/git.7 index 45124fdc8..e398e79b5 100644 --- a/man7/git.7 +++ b/man7/git.7 @@ -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" "7" "10/24/2007" "Git 1.5.3.4.320.g8d863" "Git Manual" +.TH "GIT" "7" "10/31/2007" "Git 1.5.3.4.498.g9c514" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -277,9 +277,6 @@ Send a collection of patches as emails. .TP \fBgit\-svn\fR(1) Bidirectional operation between a single Subversion branch and git. -.TP -\fBgit\-svnimport\fR(1) -Import a SVN repository into git. .SH "LOW\-LEVEL COMMANDS (PLUMBING)" Although git includes its own porcelain layer, its low\-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about \fBgit\-update\-index\fR(1) and \fBgit\-read\-tree\fR(1). -- 2.26.2