X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitRepo.vala;h=afb8ab4d992e86d99e303f0749338b8da2bd4dbe;hp=df1345bce643007b37a85275cfba6fce0a29d7a4;hb=0a028a79a26974765e7552ce4a8afb6c1e9d62a1;hpb=ecaffc9070026df0af77c7b5d12a7facb6d479c7

diff --git a/GitRepo.vala b/GitRepo.vala
index df1345bc..afb8ab4d 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -364,15 +364,16 @@ public class GitRepo : Object
 				  } catch(Error e) {
 				 		GitMonitor.gitmonitor.pauseError(e.message);
 				 		return false;	     	
-				
 				  }
 				  try {
 					   if (branchname != "master") {
 					       string[] cmd = { "merge", "master"  };
 						    this.git(cmd);
-			  		       cmd = { "commit",   "-a" , "-m",  "merge master changes" };
-			               this.git( cmd );
+						    this.push();
+			  		       //cmd = { "commit",   "-a" , "-m",  "merge master changes" };
+			               //git chethis.git( cmd );
 					    }
+					    
 				   } catch(Error e) {
    				   	    string[] cmd = { "checkout", "master"  };
 					    this.git(cmd);