summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Poole <mdpoole@troilus.org>2007-02-28 03:27:44 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-28 04:44:52 (GMT)
commit0a43acbe85fedf0226bd04aa210c529c72325982 (patch)
tree382c99bfdb64d9e5ab59c812b9311f5be55d8613
parentaa27e46111a777ae8b11e00675e13b1a9cde7fc2 (diff)
downloadgit-0a43acbe85fedf0226bd04aa210c529c72325982.zip
git-0a43acbe85fedf0226bd04aa210c529c72325982.tar.gz
git-0a43acbe85fedf0226bd04aa210c529c72325982.tar.bz2
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>
-rw-r--r--Documentation/git-cvsimport.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index f5450de..0d59c06 100644
--- 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>
--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.
@@ -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.
+-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>