summaryrefslogtreecommitdiff
path: root/docs/git2/merge.luadoc
blob: 0b10806d5d39d9fc4671e2dcebefe7bd385aa352 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
--
-- Warning: AUTOGENERATED DOCS.
--

--- Class "merge".
--
module("merge")

--- module function.
--
-- <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/merge/git_merge_base">git_merge_base</a>:<p><p>
-- @param repo the repository where the commits exist.  Must be of type <a href="Repository.html">Repository</a>.
-- @param one one of the commits.  Must be of type <a href="OID.html">OID</a>.
-- @param two the other commit.  Must be of type <a href="OID.html">OID</a>.
-- @return <a href="OID.html">OID</a> or <code>nil</code> on error.
-- @return Error string.
-- @name merge.base
function merge.base(repo, one, two)
end