Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint

* rj/maint-1.6.0-svn-parse-fix:
git-svn: fix a sloppy Getopt::Long usage

diff --git a/git-svn.perl b/git-svn.perl
index 931d1a37bcf7c905f9968b7ce58e0dd329007f3d..3b524207ffef124ca62c82af33396fe87723be6c 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -144,7 +144,7 @@ BEGIN
                   'dry-run|n' => \$_dry_run } ],
        'set-tree' => [ \&cmd_set_tree,
                        "Set an SVN repository to a git tree-ish",
-                       { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
+                       { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
        'create-ignore' => [ \&cmd_create_ignore,
                             'Create a .gitignore per svn:ignore',
                             { 'revision|r=i' => \$_revision