projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
1245856
)
sync with changes
author
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 08:05:32 +0000
(16:05 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 08:05:32 +0000
(16:05 +0800)
GitRepo.vala
patch
|
blob
|
history
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) {