diff options
Diffstat (limited to 'docs/git2/merge.luadoc')
| -rw-r--r-- | docs/git2/merge.luadoc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/docs/git2/merge.luadoc b/docs/git2/merge.luadoc new file mode 100644 index 0000000..0b10806 --- /dev/null +++ b/docs/git2/merge.luadoc @@ -0,0 +1,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 + |