Skip to content

Commit

Permalink
Correct ordering in git-cvsimport's option documentation
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
entrope authored and Junio C Hamano committed Feb 28, 2007
1 parent aa27e46 commit 0a43acb
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions Documentation/git-cvsimport.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 <[email protected]>
Expand Down

0 comments on commit 0a43acb

Please sign in to comment.