{"thread":{"id":"36780","subject":"[Patch] git-svn: support dcommit --preserve-merges","startedAt":"2014-05-29T06:33:05Z","lastAt":"2014-05-29T06:33:05Z","messageCount":1,"participants":["Nate."],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"242926","messageId":"CAFRjA7iSP3+97F7yfufGOQfdrF2hSXdP9hJVAn0vn1GtyiDFHg@mail.gmail.com","threadId":"36780","inReplyTo":null,"subject":"[Patch] git-svn: support dcommit --preserve-merges","fromName":"Nate.","fromEmail":"e4r7hbug@gmail.com","sentAt":"2014-05-29T06:33:05Z","receivedAt":"2014-05-29T06:33:05Z","isPatch":true,"sender":{"key":"e4r7hbug@gmail.com","avatar":null},"body":"Need to update git-svn.perl to match Documentation/git-svn.txt so\n--preserve-merges|p can be used in dcommit. Similar to\nhttps://github.com/git/git/commit/b64e1f58158d1d1a8eafabbbf002a1a3c1d72929#diff-f9a64e34cbe6c3ee4f62698008a33773R571\n\nNate.\n\n\nDocumentation/git-svn.txt\n 626 -m::\n 627 --merge::\n 628 -s<strategy>::\n 629 --strategy=<strategy>::\n 630 -p::\n 631 --preserve-merges::\n 632         These are only used with the 'dcommit' and 'rebase' commands.\n\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 0a32372..3f981f8 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -197,6 +197,7 @@ my %cmd = (\n                          'no-rebase' => \\$_no_rebase,\n                          'mergeinfo=s' => \\$_merge_info,\n                          'interactive|i' => \\$_interactive,\n+                         'preserve-merges|p' => \\$_preserve_merges,\n                        %cmt_opts, %fc_opts } ],\n        branch => [ \\&cmd_branch,\n                    'Create a branch in the SVN repository',\n"}]}