projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ecaffc9
)
sync with changes
author
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 08:06:59 +0000
(16:06 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 08:06:59 +0000
(16:06 +0800)
GitRepo.vala
patch
|
blob
|
history
diff --git
a/GitRepo.vala
b/GitRepo.vala
index
df1345b
..
afb8ab4
100644
(file)
--- a/
GitRepo.vala
+++ b/
GitRepo.vala
@@
-364,15
+364,16
@@
public class GitRepo : Object
} catch(Error e) {
GitMonitor.gitmonitor.pauseError(e.message);
return false;
} catch(Error e) {
GitMonitor.gitmonitor.pauseError(e.message);
return false;
-
}
try {
if (branchname != "master") {
string[] cmd = { "merge", "master" };
this.git(cmd);
}
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);
} catch(Error e) {
string[] cmd = { "checkout", "master" };
this.git(cmd);