Merge branch 'jc/bm'

[git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index 07748bc3e3f4091613c8e78647a471ac21ee46d2..4288a05c166b0b75bba387c099daa8622fea487a 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -111,7 +111,7 @@ my %cmd = (
                        { 'merge|m|M' => \$_merge,
                          'strategy|s=s' => \$_strategy,
                          'dry-run|n' => \$_dry_run,
-                       %cmt_opts } ],
+                       %cmt_opts, %fc_opts } ],
        'set-tree' => [ \&commit, "Set an SVN repository to a git tree-ish",
                        {       'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
        'show-ignore' => [ \&show_ignore, "Show svn:ignore listings",