[Patch] git-svn: support dcommit --preserve-merges

From: Nate. <e4r7hbug@gmail.com>
Date: May 29, 2014, 06:33 UTC
Message-ID: <CAFRjA7iSP3+97F7yfufGOQfdrF2hSXdP9hJVAn0vn1GtyiDFHg@mail.gmail.com>

Need to update git-svn.perl to match Documentation/git-svn.txt so --preserve-merges|p can be used in dcommit. Similar to https://github.com/git/git/commit/b64e1f58158d1d1a8eafabbbf002a1a3c1d72929#diff-f9a64e34cbe6c3ee4f62698008a33773R571

Nate.

Documentation/git-svn.txt
 626 -m::
 627 --merge::
 628 -s<strategy>::
 629 --strategy=<strategy>::
 630 -p::
 631 --preserve-merges::
 632         These are only used with the 'dcommit' and 'rebase' commands.

diff --git a/git-svn.perl b/git-svn.perl
index 0a32372..3f981f8 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -197,6 +197,7 @@ my %cmd = (
                          'no-rebase' => \$_no_rebase,
                          'mergeinfo=s' => \$_merge_info,
                          'interactive|i' => \$_interactive,
+                         'preserve-merges|p' => \$_preserve_merges,
                        %cmt_opts, %fc_opts } ],
        branch => [ \&cmd_branch,
                    'Create a branch in the SVN repository',