diff options
Diffstat (limited to 'docs')
28 files changed, 365 insertions, 13 deletions
diff --git a/docs/git2.luadoc b/docs/git2.luadoc index d0e5848..6e44f0d 100644 --- a/docs/git2.luadoc +++ b/docs/git2.luadoc @@ -26,6 +26,7 @@ -- <br />Class <a href="Tag.html">Tag</a> -- <br />Class <a href="RevWalk.html">RevWalk</a> -- <br />Class <a href="Reference.html">Reference</a> +-- <br />Class <a href="merge.html">merge</a> module("git2") --- module function. diff --git a/docs/git2/Index.luadoc b/docs/git2/Index.luadoc index bfa51cc..fe961e5 100644 --- a/docs/git2/Index.luadoc +++ b/docs/git2/Index.luadoc @@ -166,9 +166,10 @@ end -- -- <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/index/git_index_read_tree">git_index_read_tree</a>:<p><p>The current index contents will be replaced by the specified tree. -- @param tree tree to read. Must be of type <a href="Tree.html">Tree</a>. +-- @param should_be_null Must be of type <code>lightuserdata</code>. -- @return <code>true</code> if no error. -- @return Error string. -- @name Index:read_tree -function Index:read_tree(tree) +function Index:read_tree(tree, should_be_null) end diff --git a/docs/git2/Repository.luadoc b/docs/git2/Repository.luadoc index 3be21a3..5273e7d 100644 --- a/docs/git2/Repository.luadoc +++ b/docs/git2/Repository.luadoc @@ -100,10 +100,11 @@ end -- all the common workdir operations (checkout, status, index -- manipulation, etc). -- @param workdir The path to a working directory. Must be of type <code>string</code>. +-- @param update_gitlink Must be of type <code>integer</code>. -- @return <code>true</code> if no error. -- @return Error string. -- @name Repository:set_workdir -function Repository:set_workdir(workdir) +function Repository:set_workdir(workdir, update_gitlink) end --- object method. diff --git a/docs/git2/TreeEntry.luadoc b/docs/git2/TreeEntry.luadoc index 7fb85ea..73ee453 100644 --- a/docs/git2/TreeEntry.luadoc +++ b/docs/git2/TreeEntry.luadoc @@ -16,10 +16,9 @@ end --- object method. -- --- <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/tree/git_tree_entry_attributes">git_tree_entry_attributes</a>:<p><p> -- @return <code>integer</code>. --- @name TreeEntry:attributes -function TreeEntry:attributes() +-- @name TreeEntry:filemode +function TreeEntry:filemode() end --- object method. 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 + diff --git a/docs/index.html b/docs/index.html index c6ed799..f86174f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -118,6 +118,10 @@ <a href="modules/git2.html">git2</a> </li> + <li> + <a href="modules/merge.html">merge</a> + </li> + </ul> @@ -244,6 +248,11 @@ <td class="summary">Module git2.</td> </tr> + <tr> + <td class="name"><a href="modules/merge.html">merge</a></td> + <td class="summary">Class "merge".</td> + </tr> + </table> diff --git a/docs/modules/Blob.html b/docs/modules/Blob.html index 5e01c97..aef9f51 100644 --- a/docs/modules/Blob.html +++ b/docs/modules/Blob.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/Commit.html b/docs/modules/Commit.html index ab884fb..0b8cb63 100644 --- a/docs/modules/Commit.html +++ b/docs/modules/Commit.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/Config.html b/docs/modules/Config.html index 213b179..d8ca29f 100644 --- a/docs/modules/Config.html +++ b/docs/modules/Config.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/Index.html b/docs/modules/Index.html index 8857b39..b4acc6a 100644 --- a/docs/modules/Index.html +++ b/docs/modules/Index.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> @@ -208,7 +212,7 @@ </tr> <tr> - <td class="name" nowrap><a href="#Index:read_tree">Index:read_tree</a> (tree)</td> + <td class="name" nowrap><a href="#Index:read_tree">Index:read_tree</a> (tree, should_be_null)</td> <td class="summary">object method.</td> </tr> @@ -626,7 +630,7 @@ object method. <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/ -<dt><a name="Index:read_tree"></a><strong>Index:read_tree</strong> (tree)</dt> +<dt><a name="Index:read_tree"></a><strong>Index:read_tree</strong> (tree, should_be_null)</dt> <dd> object method. <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/index/git_index_read_tree">git_index_read_tree</a>:<p><p>The current index contents will be replaced by the specified tree. @@ -638,6 +642,10 @@ object method. <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/ tree: tree to read. Must be of type <a href="Tree.html">Tree</a>. </li> + <li> + should_be_null: Must be of type <code>lightuserdata</code>. + </li> + </ul> diff --git a/docs/modules/IndexEntry.html b/docs/modules/IndexEntry.html index 4ff440e..67581af 100644 --- a/docs/modules/IndexEntry.html +++ b/docs/modules/IndexEntry.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/IndexEntryUnmerged.html b/docs/modules/IndexEntryUnmerged.html index e8e5b22..df2c314 100644 --- a/docs/modules/IndexEntryUnmerged.html +++ b/docs/modules/IndexEntryUnmerged.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/ODB.html b/docs/modules/ODB.html index 1076315..94d991e 100644 --- a/docs/modules/ODB.html +++ b/docs/modules/ODB.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/ODBBackend.html b/docs/modules/ODBBackend.html index 3d1dfbc..8a57f15 100644 --- a/docs/modules/ODBBackend.html +++ b/docs/modules/ODBBackend.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/OID.html b/docs/modules/OID.html index 4e86584..160a97f 100644 --- a/docs/modules/OID.html +++ b/docs/modules/OID.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/OID_Shorten.html b/docs/modules/OID_Shorten.html index 07467a7..7567e81 100644 --- a/docs/modules/OID_Shorten.html +++ b/docs/modules/OID_Shorten.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/Object.html b/docs/modules/Object.html index 87ef26e..b22a03d 100644 --- a/docs/modules/Object.html +++ b/docs/modules/Object.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/OdbObject.html b/docs/modules/OdbObject.html index 971953a..dc2cb27 100644 --- a/docs/modules/OdbObject.html +++ b/docs/modules/OdbObject.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/Reference.html b/docs/modules/Reference.html index 9e9bfc7..20c255f 100644 --- a/docs/modules/Reference.html +++ b/docs/modules/Reference.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/Repository.html b/docs/modules/Repository.html index eb4d77f..faeb1b9 100644 --- a/docs/modules/Repository.html +++ b/docs/modules/Repository.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> @@ -213,7 +217,7 @@ </tr> <tr> - <td class="name" nowrap><a href="#Repository:set_workdir">Repository:set_workdir</a> (workdir)</td> + <td class="name" nowrap><a href="#Repository:set_workdir">Repository:set_workdir</a> (workdir, update_gitlink)</td> <td class="summary">object method.</td> </tr> @@ -595,7 +599,7 @@ object method. <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/ -<dt><a name="Repository:set_workdir"></a><strong>Repository:set_workdir</strong> (workdir)</dt> +<dt><a name="Repository:set_workdir"></a><strong>Repository:set_workdir</strong> (workdir, update_gitlink)</dt> <dd> object method. <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/repository/git_repository_set_workdir">git_repository_set_workdir</a>:<p><p>The working directory doesn't need to be the same one that contains the `.git` folder for this repository.<p> If this repository is bare, setting its working directory will turn it into a normal repository, capable of performing all the common workdir operations (checkout, status, index manipulation, etc). @@ -607,6 +611,10 @@ object method. <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/ workdir: The path to a working directory. Must be of type <code>string</code>. </li> + <li> + update_gitlink: Must be of type <code>integer</code>. + </li> + </ul> diff --git a/docs/modules/RevWalk.html b/docs/modules/RevWalk.html index 6e99863..c53b357 100644 --- a/docs/modules/RevWalk.html +++ b/docs/modules/RevWalk.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/Signature.html b/docs/modules/Signature.html index 66eca21..3fcaa87 100644 --- a/docs/modules/Signature.html +++ b/docs/modules/Signature.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/StrArray.html b/docs/modules/StrArray.html index 1fad380..6e1c96d 100644 --- a/docs/modules/StrArray.html +++ b/docs/modules/StrArray.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/Tag.html b/docs/modules/Tag.html index 7bc7d6a..dfd6c96 100644 --- a/docs/modules/Tag.html +++ b/docs/modules/Tag.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/Tree.html b/docs/modules/Tree.html index d7b8481..719a523 100644 --- a/docs/modules/Tree.html +++ b/docs/modules/Tree.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> diff --git a/docs/modules/TreeEntry.html b/docs/modules/TreeEntry.html index 2033128..103d201 100644 --- a/docs/modules/TreeEntry.html +++ b/docs/modules/TreeEntry.html @@ -116,6 +116,10 @@ <a href="../modules/git2.html">git2</a> </li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> @@ -143,7 +147,7 @@ <table class="function_list"> <tr> - <td class="name" nowrap><a href="#TreeEntry:attributes">TreeEntry:attributes</a> ()</td> + <td class="name" nowrap><a href="#TreeEntry:filemode">TreeEntry:filemode</a> ()</td> <td class="summary">object method.</td> </tr> @@ -179,9 +183,9 @@ -<dt><a name="TreeEntry:attributes"></a><strong>TreeEntry:attributes</strong> ()</dt> +<dt><a name="TreeEntry:filemode"></a><strong>TreeEntry:filemode</strong> ()</dt> <dd> -object method. <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/tree/git_tree_entry_attributes">git_tree_entry_attributes</a>:<p><p> +object method. diff --git a/docs/modules/git2.html b/docs/modules/git2.html index 9a44134..8795a38 100644 --- a/docs/modules/git2.html +++ b/docs/modules/git2.html @@ -116,6 +116,10 @@ <li><strong>git2</strong></li> + <li> + <a href="../modules/merge.html">merge</a> + </li> + </ul> @@ -133,7 +137,7 @@ <h1>Module <code>git2</code></h1> -<p>Module git2. See <a href="http://libgit2.github.com/libgit2/#HEAD">libgit2 API docs</a>. <br />Class <a href="StrArray.html">StrArray</a> <br />Class <a href="Repository.html">Repository</a> <br />Class <a href="Config.html">Config</a> <br />Class <a href="OdbObject.html">OdbObject</a> <br />Class <a href="OID.html">OID</a> <br />Class <a href="OID_Shorten.html">OID_Shorten</a> <br />Class <a href="ODB.html">ODB</a> <br />Class <a href="ODBBackend.html">ODBBackend</a> <br />Class <a href="Index.html">Index</a> <br />Class <a href="IndexEntry.html">IndexEntry</a> <br />Class <a href="IndexEntryUnmerged.html">IndexEntryUnmerged</a> <br />Class <a href="Object.html">Object</a> <br />Class <a href="Blob.html">Blob</a> <br />Class <a href="Signature.html">Signature</a> <br />Class <a href="Commit.html">Commit</a> <br />Class <a href="Tree.html">Tree</a> <br />Class <a href="TreeEntry.html">TreeEntry</a> <br />Class <a href="Tag.html">Tag</a> <br />Class <a href="RevWalk.html">RevWalk</a> <br />Class <a href="Reference.html">Reference</a></p> +<p>Module git2. See <a href="http://libgit2.github.com/libgit2/#HEAD">libgit2 API docs</a>. <br />Class <a href="StrArray.html">StrArray</a> <br />Class <a href="Repository.html">Repository</a> <br />Class <a href="Config.html">Config</a> <br />Class <a href="OdbObject.html">OdbObject</a> <br />Class <a href="OID.html">OID</a> <br />Class <a href="OID_Shorten.html">OID_Shorten</a> <br />Class <a href="ODB.html">ODB</a> <br />Class <a href="ODBBackend.html">ODBBackend</a> <br />Class <a href="Index.html">Index</a> <br />Class <a href="IndexEntry.html">IndexEntry</a> <br />Class <a href="IndexEntryUnmerged.html">IndexEntryUnmerged</a> <br />Class <a href="Object.html">Object</a> <br />Class <a href="Blob.html">Blob</a> <br />Class <a href="Signature.html">Signature</a> <br />Class <a href="Commit.html">Commit</a> <br />Class <a href="Tree.html">Tree</a> <br />Class <a href="TreeEntry.html">TreeEntry</a> <br />Class <a href="Tag.html">Tag</a> <br />Class <a href="RevWalk.html">RevWalk</a> <br />Class <a href="Reference.html">Reference</a> <br />Class <a href="merge.html">merge</a></p> diff --git a/docs/modules/merge.html b/docs/modules/merge.html new file mode 100644 index 0000000..2e395c8 --- /dev/null +++ b/docs/modules/merge.html @@ -0,0 +1,229 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> +<head> + <title>Reference</title> + <link rel="stylesheet" href="../luadoc.css" type="text/css" /> + <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/--> +</head> + +<body> +<div id="container"> + +<div id="product"> + <div id="product_logo"></div> + <div id="product_name"><big><b></b></big></div> + <div id="product_description"></div> +</div> <!-- id="product" --> + +<div id="main"> + +<div id="navigation"> + + +<h1>LuaDoc</h1> +<ul> + + <li><a href="../index.html">Index</a></li> + +</ul> + + +<!-- Module list --> + +<h1>Modules</h1> +<ul> + + <li> + <a href="../modules/Blob.html">Blob</a> + </li> + + <li> + <a href="../modules/Commit.html">Commit</a> + </li> + + <li> + <a href="../modules/Config.html">Config</a> + </li> + + <li> + <a href="../modules/Index.html">Index</a> + </li> + + <li> + <a href="../modules/IndexEntry.html">IndexEntry</a> + </li> + + <li> + <a href="../modules/IndexEntryUnmerged.html">IndexEntryUnmerged</a> + </li> + + <li> + <a href="../modules/ODB.html">ODB</a> + </li> + + <li> + <a href="../modules/ODBBackend.html">ODBBackend</a> + </li> + + <li> + <a href="../modules/OID.html">OID</a> + </li> + + <li> + <a href="../modules/OID_Shorten.html">OID_Shorten</a> + </li> + + <li> + <a href="../modules/Object.html">Object</a> + </li> + + <li> + <a href="../modules/OdbObject.html">OdbObject</a> + </li> + + <li> + <a href="../modules/Reference.html">Reference</a> + </li> + + <li> + <a href="../modules/Repository.html">Repository</a> + </li> + + <li> + <a href="../modules/RevWalk.html">RevWalk</a> + </li> + + <li> + <a href="../modules/Signature.html">Signature</a> + </li> + + <li> + <a href="../modules/StrArray.html">StrArray</a> + </li> + + <li> + <a href="../modules/Tag.html">Tag</a> + </li> + + <li> + <a href="../modules/Tree.html">Tree</a> + </li> + + <li> + <a href="../modules/TreeEntry.html">TreeEntry</a> + </li> + + <li> + <a href="../modules/git2.html">git2</a> + </li> + + <li><strong>merge</strong></li> + +</ul> + + + +<!-- File list --> + + + + + + +</div><!-- id="navigation" --> + +<div id="content"> + +<h1>Module <code>merge</code></h1> + +<p>Class "merge". </p> + + + + + +<h2>Functions</h2> +<table class="function_list"> + + <tr> + <td class="name" nowrap><a href="#merge.base">merge.base</a> (repo, one, two)</td> + <td class="summary">module function.</td> + </tr> + +</table> + + + + + + +<br/> +<br/> + + + +<h2><a name="functions"></a>Functions</h2> +<dl class="function"> + + + +<dt><a name="merge.base"></a><strong>merge.base</strong> (repo, one, two)</dt> +<dd> +module function. <p>Calls <a href="http://libgit2.github.com/libgit2/#HEAD/group/merge/git_merge_base">git_merge_base</a>:<p><p> + + +<h3>Parameters</h3> +<ul> + + <li> + repo: the repository where the commits exist. Must be of type <a href="Repository.html">Repository</a>. + </li> + + <li> + one: one of the commits. Must be of type <a href="OID.html">OID</a>. + </li> + + <li> + two: the other commit. Must be of type <a href="OID.html">OID</a>. + </li> + +</ul> + + + + + + +<h3>Return values:</h3> +<ol> + + <li><a href="OID.html">OID</a> or <code>nil</code> on error. + + <li>Error string. + +</ol> + + + +</dd> + + +</dl> + + + + + + +</div> <!-- id="content" --> + +</div> <!-- id="main" --> + +<div id="about"> + <p><a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" /></a></p> +</div> <!-- id="about" --> + +</div> <!-- id="container" --> +</body> +</html> |