Documentation/git-cherry-pick: Add --replay and --no-commit.

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index efe193439bda26d72be3f94b9dd164013967b14f..08a890c2bb4292ddb4c7705da4ddc5a21bd1219a 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -502,7 +502,7 @@ ($$)
        if ($opt_P) {
            exec("cat", $opt_P);
        } else {
-           exec("cvsps",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
+           exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
            die "Could not start cvsps: $!\n";
        }
 }