From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Tue, 5 Jul 2005 12:23:36 +0000 (+0200)
Subject: Merge with http://www.liacs.nl/~sverdool/git.git#cvs2git
X-Git-Tag: v0.99~71^2^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f13bbe7f56e49a11f6bfc3b73a463c741f969c9c;p=git.git

Merge ... www.liacs.nl/~sverdool/git.git#cvs2git
---

f13bbe7f56e49a11f6bfc3b73a463c741f969c9c
diff --cc git-cvsimport-script
index f71da43c3,cdf989161..4c0333b92
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@@ -38,7 -40,7 +40,7 @@@ EN
  	exit(1);
  }
  
- getopts("hvo:d:p:C:") or usage();
 -getopts("hqvo:d:p:C:z:") or usage();
++getopts("hvo:d:p:C:z:") or usage();
  usage if $opt_h;
  
  @ARGV <= 1 or usage();