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:
caaad4a
)
Git.vala
author
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 03:27:28 +0000
(11:27 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 03:27:28 +0000
(11:27 +0800)
Git.vala
patch
|
blob
|
history
diff --git
a/Git.vala
b/Git.vala
index
5d4d6ac
..
6e00fc4
100644
(file)
--- a/
Git.vala
+++ b/
Git.vala
@@
-194,7
+194,10
@@
namespace GitLive {
var master_commit = this.repo.lookup_commit(master_oid);;
var head_commit = this.repo.lookup_commit(head_oid);
+
+ var anc_oid = this.repo.merge_base(master_commit.get_oid(), head_commit.get_oid());
+
}