cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [4/6] git commit: If there is a merge conflict, don't bring up the editor
Date Mon, 17 Mar 2014 15:29:46 GMT
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/336b9e0e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/336b9e0e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/336b9e0e

Branch: refs/heads/2.6.x-fixes
Commit: 336b9e0e27b2043004e06d0151fb2019e03542ad
Parents: d3d5b27
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Mar 7 16:48:38 2014 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Mon Mar 17 11:19:16 2014 -0400

----------------------------------------------------------------------
 bin/DoMerges.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/336b9e0e/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;
     }   


Mime
View raw message