Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A0DD410B52 for ; Fri, 7 Mar 2014 21:54:13 +0000 (UTC) Received: (qmail 33225 invoked by uid 500); 7 Mar 2014 21:54:08 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 33058 invoked by uid 500); 7 Mar 2014 21:54:08 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 33037 invoked by uid 99); 7 Mar 2014 21:54:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Mar 2014 21:54:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5077893AA23; Fri, 7 Mar 2014 21:54:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Fri, 07 Mar 2014 21:54:08 -0000 Message-Id: <26605ad57dac4432a5f189cfc3e3e289@git.apache.org> In-Reply-To: <1006eb15e4bf4f0cb8b5e3c349393742@git.apache.org> References: <1006eb15e4bf4f0cb8b5e3c349393742@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: If there is a merge conflict, don't bring up the editor 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 Authored: Fri Mar 7 16:48:38 2014 -0500 Committer: Daniel Kulp 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; }