Correct ordering in git-cvsimport's option documentation

A pair of commits on January 8th added option documentation (for -a,
-S and -L) in the middle of the documentation for the -A option.  This
makes -A's documentation contiguous again.

Signed-off-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index f5450de74a220c2c3c842835749c20f34cfef1f2..0d59c061394777c9b4655e7096b8ea372971e360 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -96,11 +96,6 @@ If you need to pass multiple options, separate them with a comma.
 -s <subst>::
        Substitute the character "/" in branch names with <subst>
 
 -s <subst>::
        Substitute the character "/" in branch names with <subst>
 

--A <author-conv-file>::
-       CVS by default uses the Unix username when writing its
-       commit logs. Using this option and an author-conv-file
-       in this format
-

 -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.


@@ -112,6 +107,10 @@ If you need to pass multiple options, separate them with a comma.
        Limit the number of commits imported. Workaround for cases where
        cvsimport leaks memory.
 
        Limit the number of commits imported. Workaround for cases where
        cvsimport leaks memory.
 

+-A <author-conv-file>::
+       CVS by default uses the Unix username when writing its
+       commit logs. Using this option and an author-conv-file
+       in this format

 +
 ---------
        exon=Andreas Ericsson <ae@op5.se>
 +
 ---------
        exon=Andreas Ericsson <ae@op5.se>