@matheusbsbs / matheus-bagliano / commits / 0a43acbe85
Fork 0

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>

Michael Poole committed Feb 27, 2007 at 22:27 UTC 0a43acbe85fedf0226bd04aa210c529c72325982
1 file changed +4 -5
Documentation/git-cvsimport.txt
+4 -5
@@ -96,11 +96,6 @@ If you need to pass multiple options, separate them with a comma.
96 -s <subst>::
97 Substitute the character "/" in branch names with <subst>
98
99 --A <author-conv-file>::
100 - CVS by default uses the Unix username when writing its
101 - commit logs. Using this option and an author-conv-file
102 - in this format
103 -
99 -a::
100 Import all commits, including recent ones. cvsimport by default
101 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.
107 Limit the number of commits imported. Workaround for cases where
108 cvsimport leaks memory.
109
110 +-A <author-conv-file>::
111 + CVS by default uses the Unix username when writing its
112 + commit logs. Using this option and an author-conv-file
113 + in this format
114 +
115 ---------
116 exon=Andreas Ericsson <ae@op5.se>