This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 363d054557f1178365d712093bf9146d3fd2cb81 Author: Daniel Kulp <[email protected]> AuthorDate: Wed Nov 1 11:26:49 2017 -0400 Add -x to cherrypick (cherry picked from commit fd219974307b64fee8fe476c1b6a2b696df90d1a) --- bin/DoMerges.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/DoMerges.java b/bin/DoMerges.java index 830f6d5..d5c1935 100644 --- a/bin/DoMerges.java +++ b/bin/DoMerges.java @@ -282,7 +282,7 @@ public class DoMerges { } private static void doMerge(String ver) throws Exception { - Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "cherry-pick", ver})); + Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "cherry-pick", "-x", ver})); if (runProcess(p, false) != 0) { p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "status"})); runProcess(p); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
