cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: If there is a merge conflict, don't bring up the editor
Date Fri, 07 Mar 2014 21:48:58 GMT
Repository: cxf
Updated Branches:
  refs/heads/master b5162d492 -> 566ac6d95


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/566ac6d9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/566ac6d9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/566ac6d9

Branch: refs/heads/master
Commit: 566ac6d958e65af7d73235e876ab0d244a8d2c13
Parents: b5162d4
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri Mar 7 16:48:38 2014 -0500
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri Mar 7 16:48:38 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/566ac6d9/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