sync with changes

[gitlive] / GitRepo.vala

diff --git a/GitRepo.vala b/GitRepo.vala
index 034d535..df1345b 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -370,7 +370,7 @@ public class GitRepo : Object
                                           if (branchname != "master") {
                                               string[] cmd = { "merge", "master"  };
                                                    this.git(cmd);
-                                              cmd = { "commit",   "-a" , "-m",  commit_message };
+                                              cmd = { "commit",   "-a" , "-m",  "merge master changes" };
                                       this.git( cmd );
                                            }
                                   } catch(Error e) {