git-bundle: only die if pack would be empty, warn if ref is skipped

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index 44713949a59283b68567369088e2b74f073e57d0..0d59c061394777c9b4655e7096b8ea372971e360 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -3,7 +3,7 @@ git-cvsimport(1)
 
 NAME
 ----
-git-cvsimport - Import a CVS repository into git
+git-cvsimport - Salvage your data out of another SCM people love to hate
 
 
 SYNOPSIS
@@ -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>