cvsimport: Reorder options in documentation for better understanding

The current order the options are documented in makes no sense
at all to me. Reorder them so that similar options are grouped
together and also order them somehwhat by importance.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 6a0821a37c6d83457290709087604bc1b7887901..a5276f776fc6fc90714b040668ce67443cde1a7b 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -32,6 +32,9 @@ any CVS branches, yourself.
 
 OPTIONS
 -------
 
 OPTIONS
 -------

+-v::
+       Verbosity: let 'cvsimport' report what it is doing.
+

 -d <CVSROOT>::
        The root of the CVS archive. May be local (a simple path) or remote;
        currently, only the :local:, :ext: and :pserver: access methods 
 -d <CVSROOT>::
        The root of the CVS archive. May be local (a simple path) or remote;
        currently, only the :local:, :ext: and :pserver: access methods 


@@ -39,10 +42,23 @@ OPTIONS
        from `CVS/Root`. If no such file exists, it checks for the
        `CVSROOT` environment variable.
 
        from `CVS/Root`. If no such file exists, it checks for the
        `CVSROOT` environment variable.
 

+<CVS_module>::
+       The CVS module you want to import. Relative to <CVSROOT>.
+       If not given, git-cvsimport tries to read it from
+       `CVS/Repository`.
+

 -C <target-dir>::
         The git repository to import to.  If the directory doesn't
         exist, it will be created.  Default is the current directory.
 
 -C <target-dir>::
         The git repository to import to.  If the directory doesn't
         exist, it will be created.  Default is the current directory.
 

+-o <branch-for-HEAD>::
+       The 'HEAD' branch from CVS is imported to the 'origin' branch within
+       the git repository, as 'HEAD' already has a special meaning for git.
+       Use this option if you want to import into a different branch.
++
+Use '-o master' for continuing an import that was initially done by
+the old cvs2git tool.
+

 -i::
        Import-only: don't perform a checkout after importing.  This option
        ensures the working directory and index remain untouched and will
 -i::
        Import-only: don't perform a checkout after importing.  This option
        ensures the working directory and index remain untouched and will


@@ -56,13 +72,8 @@ OPTIONS
 -u::
        Convert underscores in tag and branch names to dots.
 
 -u::
        Convert underscores in tag and branch names to dots.
 

--o <branch-for-HEAD>::
-       The 'HEAD' branch from CVS is imported to the 'origin' branch within
-       the git repository, as 'HEAD' already has a special meaning for git.
-       Use this option if you want to import into a different branch.
-+
-Use '-o master' for continuing an import that was initially done by
-the old cvs2git tool.
+-s <subst>::
+       Substitute the character "/" in branch names with <subst>

 
 -p <options-for-cvsps>::
        Additional options for cvsps.
 
 -p <options-for-cvsps>::
        Additional options for cvsps.


@@ -70,6 +81,10 @@ the old cvs2git tool.
 +
 If you need to pass multiple options, separate them with a comma.
 
 +
 If you need to pass multiple options, separate them with a comma.
 

+-z <fuzz>::
+       Pass the timestamp fuzz factor to cvsps, in seconds. If unset,
+       cvsps defaults to 300s.
+

 -P <cvsps-output-file>::
        Instead of calling cvsps, read the provided cvsps output file. Useful
        for debugging or when cvsps is being handled outside cvsimport.
 -P <cvsps-output-file>::
        Instead of calling cvsps, read the provided cvsps output file. Useful
        for debugging or when cvsps is being handled outside cvsimport.


@@ -84,31 +99,13 @@ If you need to pass multiple options, separate them with a comma.
        regex. It can be used with -m to also see the default regexes. 
        You must escape forward slashes. 
 
        regex. It can be used with -m to also see the default regexes. 
        You must escape forward slashes. 
 

--v::
-       Verbosity: let 'cvsimport' report what it is doing.
-
-<CVS_module>::
-       The CVS module you want to import. Relative to <CVSROOT>.
-       If not given, git-cvsimport tries to read it from
-       `CVS/Repository`.
-
--h::
-       Print a short usage message and exit.
-
--z <fuzz>::
-       Pass the timestamp fuzz factor to cvsps, in seconds. If unset,
-       cvsps defaults to 300s.
-
--s <subst>::
-       Substitute the character "/" in branch names with <subst>
+-S <regex>::
+       Skip paths matching the regex.

 
 -a::
        Import all commits, including recent ones. cvsimport by default
        skips commits that have a timestamp less than 10 minutes ago.
 
 
 -a::
        Import all commits, including recent ones. cvsimport by default
        skips commits that have a timestamp less than 10 minutes ago.
 

--S <regex>::
-       Skip paths matching the regex.
-

 -L <limit>::
        Limit the number of commits imported. Workaround for cases where
        cvsimport leaks memory.
 -L <limit>::
        Limit the number of commits imported. Workaround for cases where
        cvsimport leaks memory.


@@ -136,6 +133,9 @@ It is not recommended to use this feature if you intend to
 export changes back to CVS again later with
 gitlink:git-cvsexportcommit[1].
 
 export changes back to CVS again later with
 gitlink:git-cvsexportcommit[1].
 

+-h::
+       Print a short usage message and exit.
+

 OUTPUT
 ------
 If '-v' is specified, the script reports what it is doing.
 OUTPUT
 ------
 If '-v' is specified, the script reports what it is doing.