X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Git.vala;fp=Git.vala;h=d7a9afff769ae76da8dc35d1b177997290abec33;hp=63c03c7e722fb7056c41c7034c56a5ba1f2c1347;hb=f68d2d3719c508eea4ed526f7a32a4f66c5814c2;hpb=a985c70e9406cefc765b00f947df24d53346012b diff --git a/Git.vala b/Git.vala index 63c03c7e..d7a9afff 100644 --- a/Git.vala +++ b/Git.vala @@ -220,6 +220,13 @@ namespace GitLive { } + + public void diffhead() + { + + } + + public void mergeMasterIntoHead() { // assumes head is not master... @@ -272,6 +279,9 @@ namespace GitLive { } + + + /* public bool doMergeClose(string commit_message) {