projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a7c56bd
)
sync with changes
author
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 08:04:57 +0000
(16:04 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 08:04:57 +0000
(16:04 +0800)
GitRepo.vala
patch
|
blob
|
history
diff --git
a/GitRepo.vala
b/GitRepo.vala
index
dafecc6
..
034d535
100644
(file)
--- a/
GitRepo.vala
+++ b/
GitRepo.vala
@@
-247,9
+247,7
@@
public class GitRepo : Object
}
GitMonitor.gitmonitor.start();
}
-
-
-
+
public bool doMerge(string action, string ticket_id, string commit_message)
{
@@
-372,6
+370,8
@@
public class GitRepo : Object
if (branchname != "master") {
string[] cmd = { "merge", "master" };
this.git(cmd);
+ cmd = { "commit", "-a" , "-m", commit_message };
+ this.git( cmd );
}
} catch(Error e) {
string[] cmd = { "checkout", "master" };