If there is a merge conflict, don't bring up the editor
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/829cf80c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/829cf80c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/829cf80c Branch: refs/heads/2.7.x-fixes Commit: 829cf80c737b9e6b7cf4e2315670f754e59b8b6b Parents: 09815dc Author: Daniel Kulp <[email protected]> Authored: Fri Mar 7 16:48:38 2014 -0500 Committer: Daniel Kulp <[email protected]> Committed: Fri Mar 7 16:53:51 2014 -0500 ---------------------------------------------------------------------- bin/DoMerges.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/829cf80c/bin/DoMerges.java ---------------------------------------------------------------------- diff --git a/bin/DoMerges.java b/bin/DoMerges.java index 82d53be..7d3df05 100644 --- a/bin/DoMerges.java +++ b/bin/DoMerges.java @@ -124,7 +124,7 @@ public class DoMerges { return false; } - Process p = Runtime.getRuntime().exec(new String[] {"git", "commit", "-a"}); + Process p = Runtime.getRuntime().exec(new String[] {"git", "commit", "--no-edit", "-a"}); runProcess(p); return true; }
