projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
beb0b87
)
handling of old branches
author
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 07:36:36 +0000
(15:36 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 07:36:36 +0000
(15:36 +0800)
GitRepo.vala
patch
|
blob
|
history
diff --git
a/GitRepo.vala
b/GitRepo.vala
index
77a56f2
..
1916311
100644
(file)
--- a/
GitRepo.vala
+++ b/
GitRepo.vala
@@
-347,6
+347,7
@@
public class GitRepo : Object
return true;
}
return true;
}
+
public bool createBranchNamed(string branchname)
{
public bool createBranchNamed(string branchname)
{
@@
-374,7
+375,7
@@
public class GitRepo : Object
this.git(cmd);
} catch(Error e) {
try {
this.git(cmd);
} catch(Error e) {
try {
- string[] cmd = { "mergetool"
};
+ string[] cmd = { "mergetool"
, "--no-prompt" };
this.git(cmd);
cmd = { "commit", "-m" , "Fix merge conflicts from master" };
this.git(cmd);
this.git(cmd);
cmd = { "commit", "-m" , "Fix merge conflicts from master" };
this.git(cmd);
@@
-398,7
+399,7
@@
public class GitRepo : Object
string[] cmd = { "checkout", "-b" , branchname };
this.git(cmd);
string[] cmd = { "checkout", "-b" , branchname };
this.git(cmd);
- this.push();
+ this.push();
} catch(Error ee) {
GitMonitor.gitmonitor.pauseError(ee.message);
return false;
} catch(Error ee) {
GitMonitor.gitmonitor.pauseError(ee.message);
return false;