From ecaffc9070026df0af77c7b5d12a7facb6d479c7 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 5 Nov 2018 16:05:32 +0800 Subject: [PATCH] sync with changes --- GitRepo.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitRepo.vala b/GitRepo.vala index 034d535c..df1345bc 100644 --- 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) { -- 2.39.2